From bc6295c3ec1a83a14764f82ee3d8f0e9e098a0ad Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 19 Sep 2006 03:38:35 +0000
Subject: r18673: define the macros even if we don't define bool ourself

metze
(This used to be commit 65013a8d9e678c44cecae07967b7a001b796faf1)
---
 source3/lib/replace/replace.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'source3/lib/replace')

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
-- 
cgit