svn commit: samba r18673 - in branches/SAMBA_3_0/source/lib/replace: .

[metze at samba.org]

Author: metze
Date: 2006-09-19 03:38:35 +0000 (Tue, 19 Sep 2006)
New Revision: 18673

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18673

Log:
define the macros even if we don't define bool ourself

metze

Modified:
   branches/SAMBA_3_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_3_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/replace.h	2006-09-19 03:29:44 UTC (rev 18672)
+++ branches/SAMBA_3_0/source/lib/replace/replace.h	2006-09-19 03:38:35 UTC (rev 18673)
@@ -324,17 +324,25 @@
 #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