summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-21 08:48:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:00:57 -0500
commitbeecb90440af7cb59e31ffc708fdb7ad53932b6b (patch)
treebc998cf43127823325ce302d1f402b40d5282631 /source3/include
parent1260972ec9db776b679ace89bbf0473b9f991128 (diff)
downloadsamba-beecb90440af7cb59e31ffc708fdb7ad53932b6b.tar.gz
samba-beecb90440af7cb59e31ffc708fdb7ad53932b6b.tar.bz2
samba-beecb90440af7cb59e31ffc708fdb7ad53932b6b.zip
r18784: hopefully fix the BOOL bug on AIX
metze (This used to be commit 454d9590de6ff94a1edd7321e26af0f0978a356a)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/adt_tree.h4
-rw-r--r--source3/include/includes.h4
-rw-r--r--source3/include/privileges.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/include/adt_tree.h b/source3/include/adt_tree.h
index 51b6fb1c88..a053013a9b 100644
--- a/source3/include/adt_tree.h
+++ b/source3/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/source3/include/includes.h b/source3/include/includes.h
index bcf0fa4277..1dbf92f036 100644
--- a/source3/include/includes.h
+++ b/source3/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/source3/include/privileges.h b/source3/include/privileges.h
index 3f425f6d72..eac42e0ba9 100644
--- a/source3/include/privileges.h
+++ b/source3/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 {