Author: metze Date: 2006-09-21 08:48:18 +0000 (Thu, 21 Sep 2006) New Revision: 18784
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18784 Log: hopefully fix the BOOL bug on AIX metze Modified: branches/SAMBA_3_0/source/include/adt_tree.h branches/SAMBA_3_0/source/include/includes.h branches/SAMBA_3_0/source/include/privileges.h branches/SAMBA_3_0/source/lib/replace/replace.h branches/SAMBA_3_0/source/libaddns/dns.h branches/SAMBA_3_0/source/nsswitch/winbind_nss_config.h Changeset: Modified: branches/SAMBA_3_0/source/include/adt_tree.h =================================================================== --- branches/SAMBA_3_0/source/include/adt_tree.h 2006-09-21 07:35:30 UTC (rev 18783) +++ branches/SAMBA_3_0/source/include/adt_tree.h 2006-09-21 08:48:18 UTC (rev 18784) @@ -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 Modified: branches/SAMBA_3_0/source/include/includes.h =================================================================== --- branches/SAMBA_3_0/source/include/includes.h 2006-09-21 07:35:30 UTC (rev 18783) +++ branches/SAMBA_3_0/source/include/includes.h 2006-09-21 08:48:18 UTC (rev 18784) @@ -612,9 +612,9 @@ #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 Modified: branches/SAMBA_3_0/source/include/privileges.h =================================================================== --- branches/SAMBA_3_0/source/include/privileges.h 2006-09-21 07:35:30 UTC (rev 18783) +++ branches/SAMBA_3_0/source/include/privileges.h 2006-09-21 08:48:18 UTC (rev 18784) @@ -93,9 +93,9 @@ 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 { Modified: branches/SAMBA_3_0/source/lib/replace/replace.h =================================================================== --- branches/SAMBA_3_0/source/lib/replace/replace.h 2006-09-21 07:35:30 UTC (rev 18783) +++ branches/SAMBA_3_0/source/lib/replace/replace.h 2006-09-21 08:48:18 UTC (rev 18784) @@ -333,6 +333,7 @@ * * 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 @@ #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 @@ #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__ Modified: branches/SAMBA_3_0/source/libaddns/dns.h =================================================================== --- branches/SAMBA_3_0/source/libaddns/dns.h 2006-09-21 07:35:30 UTC (rev 18783) +++ branches/SAMBA_3_0/source/libaddns/dns.h 2006-09-21 08:48:18 UTC (rev 18784) @@ -279,10 +279,9 @@ typedef long HANDLE; -#ifndef _BOOL +#ifndef _UPPER_BOOL typedef int BOOL; - -#define _BOOL /* So we don't typedef BOOL again */ +#define _UPPER_BOOL #endif Modified: branches/SAMBA_3_0/source/nsswitch/winbind_nss_config.h =================================================================== --- branches/SAMBA_3_0/source/nsswitch/winbind_nss_config.h 2006-09-21 07:35:30 UTC (rev 18783) +++ branches/SAMBA_3_0/source/nsswitch/winbind_nss_config.h 2006-09-21 08:48:18 UTC (rev 18784) @@ -95,8 +95,8 @@ 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)