r18784: hopefully fix the BOOL bug on AIX

metze

diff --git a/source/include/adt_tree.h b/source/include/adt_tree.h
index 51b6fb1c88b7928f76b5fb2987e978e5b8e632a2..a053013a9bcf7e1c5e4d3867c56e5df6c931d199 100644 (file)
--- a/source/include/adt_tree.h
+++ b/source/include/adt_tree.h
@@ -21,9 +21,9 @@
 #ifndef ADT_TREE_H
 #define ADT_TREE_H
 
-#ifndef _BOOL
+#ifndef _UPPER_BOOL
 typedef int BOOL;
-#define _BOOL  
+#define _UPPER_BOOL  
 #endif
 
 

diff --git a/source/include/includes.h b/source/include/includes.h
index bcf0fa42770bf1113fd173582faf3a8ea54bbb8e..1dbf92f036053aa28a5fd36b0f047ee6ca6d26d6 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -612,9 +612,9 @@ struct timespec {
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #endif
 
-#ifndef _BOOL
+#ifndef _UPPER_BOOL
 typedef int BOOL;
-#define _BOOL       /* So we don't typedef BOOL again in vfs.h */
+#define _UPPER_BOOL
 #endif
 
 #ifdef HAVE_BROKEN_GETGROUPS

diff --git a/source/include/privileges.h b/source/include/privileges.h
index 3f425f6d7281796d46cb90d65177a21d919d0c0e..eac42e0ba937a9763355e856a1a7889dab607327 100644 (file)
--- a/source/include/privileges.h
+++ b/source/include/privileges.h
@@ -93,9 +93,9 @@ typedef struct {
        uint32 attr;
 } LUID_ATTR;
 
-#ifndef _BOOL
+#ifndef _UPPER_BOOL
 typedef int BOOL;
-#define _BOOL       /* So we don't typedef BOOL again in vfs.h */
+#define _UPPER_BOOL
 #endif
 
 typedef struct {

diff --git a/source/lib/replace/replace.h b/source/lib/replace/replace.h
index 61adb999d9dbf6b2a1c7ffd62dae05274516b59a..edcdebe6bd21db2c01aeb8b88d695af5c95f8b47 100644 (file)
--- a/source/lib/replace/replace.h
+++ b/source/lib/replace/replace.h
@@ -333,6 +333,7 @@ typedef int bool;
  *
  * IRIX, HPUX, MacOS 10 and Solaris need BOOL_DEFINED
  * Tru64 needs _BOOL_EXISTS
+ * AIX needs _BOOL,_TRUE,_FALSE
  */
 #ifndef BOOL_DEFINED
 #define BOOL_DEFINED
@@ -340,6 +341,9 @@ typedef int bool;
 #ifndef _BOOL_EXISTS
 #define _BOOL_EXISTS
 #endif
+#ifndef _BOOL
+#define _BOOL
+#endif
 
 #ifndef __bool_true_false_are_defined
 #define __bool_true_false_are_defined
@@ -352,6 +356,13 @@ typedef int bool;
 #define false (0)
 #endif
 
+#ifndef _TRUE
+#define _TRUE
+#endif
+#ifndef _FALSE
+#define _FALSE
+#endif
+
 #ifndef HAVE_FUNCTION_MACRO
 #ifdef HAVE_func_MACRO
 #define __FUNCTION__ __func__

diff --git a/source/libaddns/dns.h b/source/libaddns/dns.h
index a5d5ca04507477641fcf50bb239f7e3636b6e44c..70c6d0bd22af4a4558fee5776d7537e824b083f3 100644 (file)
--- a/source/libaddns/dns.h
+++ b/source/libaddns/dns.h
@@ -279,10 +279,9 @@ TXT             16 text strings
 
 typedef long HANDLE;
 
-#ifndef _BOOL
+#ifndef _UPPER_BOOL
 typedef int BOOL;
-
-#define _BOOL                  /* So we don't typedef BOOL again */
+#define _UPPER_BOOL
 #endif
 
 

diff --git a/source/nsswitch/winbind_nss_config.h b/source/nsswitch/winbind_nss_config.h
index f9d38526604acb8c1357c3fc5a6e712f9dded633..f7fa261f7d966c30bc0ca6341d110eeb9d757a4f 100644 (file)
--- a/source/nsswitch/winbind_nss_config.h
+++ b/source/nsswitch/winbind_nss_config.h
@@ -95,8 +95,8 @@ typedef char pstring[PSTRING_LEN];
 typedef char fstring[FSTRING_LEN];
 #endif
 
-#ifndef _BOOL
-#define _BOOL                  /* So we don't typedef BOOL again in vfs.h */
+#ifndef _UPPER_BOOL
+#define _UPPER_BOOL
 #define False (0)
 #define True (1)
 #define Auto (2)