r18675: merge from samba3:

we need to define the macros the indicate we have bool
even if we have not defining bool ourself

metze
(This used to be commit 0c18e5d9383883f696113837a9e2d1bc078f18b1)

diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h
index 688f08a51d0977e668145f0172b4e18785565417..61adb999d9dbf6b2a1c7ffd62dae05274516b59a 100644 (file)
--- a/source4/lib/replace/replace.h
+++ b/source4/lib/replace/replace.h
@@ -324,11 +324,27 @@ char *rep_mkdtemp(char *template);
 #ifdef HAVE__Bool
 #define bool _Bool
 #else
-#define __bool_true_false_are_defined
 typedef int bool;
 #endif
 #endif
 
+/*
+ * to prevent <rpcsvc/yp_prot.h> from doing a redefine of 'bool'
+ *
+ * IRIX, HPUX, MacOS 10 and Solaris need BOOL_DEFINED
+ * Tru64 needs _BOOL_EXISTS
+ */
+#ifndef BOOL_DEFINED
+#define BOOL_DEFINED
+#endif
+#ifndef _BOOL_EXISTS
+#define _BOOL_EXISTS
+#endif
+
+#ifndef __bool_true_false_are_defined
+#define __bool_true_false_are_defined
+#endif
+
 #ifndef true
 #define true (1)
 #endif