summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-19 03:38:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:00:46 -0500
commitbc6295c3ec1a83a14764f82ee3d8f0e9e098a0ad (patch)
tree3d673cd0eda2c3959ab0fc1b8f2e2ed6f13f15cd
parent70407961081d6bdef12bd5ddb9f6633bfac617ef (diff)
downloadsamba-bc6295c3ec1a83a14764f82ee3d8f0e9e098a0ad.tar.gz
samba-bc6295c3ec1a83a14764f82ee3d8f0e9e098a0ad.tar.bz2
samba-bc6295c3ec1a83a14764f82ee3d8f0e9e098a0ad.zip
r18673: define the macros even if we don't define bool ourself
metze (This used to be commit 65013a8d9e678c44cecae07967b7a001b796faf1)
-rw-r--r--source3/lib/replace/replace.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h
index eabff67cd4..61adb999d9 100644
--- a/source3/lib/replace/replace.h
+++ b/source3/lib/replace/replace.h
@@ -324,17 +324,25 @@ 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
-typedef int bool;
#endif
+
+#ifndef __bool_true_false_are_defined
+#define __bool_true_false_are_defined
#endif
#ifndef true