summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-19 03:51:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:19:01 -0500
commit0780eb7f82ed3cfb7c3091e450ee50a2e8055374 (patch)
tree971c0044c560762171dd2d7af2b57fa92412dba9
parent550495b6f9af22c47b7fd336e08f1a8eac4534ec (diff)
downloadsamba-0780eb7f82ed3cfb7c3091e450ee50a2e8055374.tar.gz
samba-0780eb7f82ed3cfb7c3091e450ee50a2e8055374.tar.bz2
samba-0780eb7f82ed3cfb7c3091e450ee50a2e8055374.zip
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)
-rw-r--r--source4/lib/replace/replace.h18
1 files changed, 17 insertions, 1 deletions
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h
index 688f08a51d..61adb999d9 100644
--- 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