소스 검색

Fix for u_int32_t typedefs (Solaris)

Ethan Galstad 23 년 전
부모
커밋
224dd97baa
2개의 변경된 파일11개의 추가작업 그리고 11개의 파일을 삭제
  1. 7 7
      common/config.h.in
  2. 4 4
      configure.in

+ 7 - 7
common/config.h.in

@@ -2,7 +2,7 @@
  *
  *
  * NRPE Common Header File
  * NRPE Common Header File
  * Copyright (c) 1999-2003 Ethan Galstad (nagios@nagios.org)
  * Copyright (c) 1999-2003 Ethan Galstad (nagios@nagios.org)
- * Last Modified: 04-04-2003
+ * Last Modified: 04-29-2003
  *
  *
  * License:
  * License:
  *
  *
@@ -45,16 +45,16 @@
 #undef U_INT32_T_IS_ULONG
 #undef U_INT32_T_IS_ULONG
 
 
 #ifdef U_INT32_T_IS_USHORT
 #ifdef U_INT32_T_IS_USHORT
-typedef unsigned short u_int32_t
-typedef short int32_t
+typedef unsigned short u_int32_t;
+typedef short int32_t;
 #endif
 #endif
 #ifdef U_INT32_T_IS_ULONG
 #ifdef U_INT32_T_IS_ULONG
-typedef unsigned long u_int32_t
-typedef long int32_t
+typedef unsigned long u_int32_t;
+typedef long int32_t;
 #endif
 #endif
 #ifdef U_INT32_T_IS_UINT
 #ifdef U_INT32_T_IS_UINT
-typedef unsigned int u_int32_t
-typedef int int32_t
+typedef unsigned int u_int32_t;
+typedef int int32_t;
 #endif
 #endif
 
 
 
 

+ 4 - 4
configure.in

@@ -43,11 +43,11 @@ AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_TYPE(u_int32_t,unsigned int)
 AC_CHECK_TYPE(u_int32_t,unsigned int)
 if test "$ac_cv_type_u_int32_t" = no ; then
 if test "$ac_cv_type_u_int32_t" = no ; then
-	if test "$ac_cv_sizeof_long" = 4 ; then
-		AC_DEFINE(U_INT32_T_IS_ULONG)
+	if test "$ac_cv_sizeof_int" = 4 ; then
+		AC_DEFINE(U_INT32_T_IS_UINT)
 	else
 	else
-		if test "$ac_cv_sizeof_int" = 4 ; then
-			AC_DEFINE(U_INT32_T_IS_UINT)
+		if test "$ac_cv_sizeof_long" = 4 ; then
+			AC_DEFINE(U_INT32_T_IS_ULONG)
 		else
 		else
 			if test "$ac_cv_sizeof_short" = 4 ; then
 			if test "$ac_cv_sizeof_short" = 4 ; then
 				AC_DEFINE(U_INT32_T_IS_USHORT)
 				AC_DEFINE(U_INT32_T_IS_USHORT)