svn commit: samba r15203 - in branches/SAMBA_4_0/source/lib/replace: .

[jelmer at samba.org]

Author: jelmer
Date: 2006-04-24 14:52:37 +0000 (Mon, 24 Apr 2006)
New Revision: 15203

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

Log:
Allow system 'bool' type to be defined in another header then stdbool.h

Modified:
   branches/SAMBA_4_0/source/lib/replace/config.m4
   branches/SAMBA_4_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/config.m4	2006-04-24 14:41:13 UTC (rev 15202)
+++ branches/SAMBA_4_0/source/lib/replace/config.m4	2006-04-24 14:52:37 UTC (rev 15203)
@@ -130,6 +130,15 @@
 
 AC_CHECK_HEADERS(stdbool.h)
 
+AC_CHECK_TYPE(bool, 
+[AC_DEFINE(HAVE_BOOL, 1, [Whether the bool type is available])],,
+[
+AC_INCLUDES_DEFAULT
+#ifdef HAVE_STDBOOL_H
+#include <stdbool.h>
+#endif]
+)
+
 sinclude(lib/replace/readline.m4)
 sinclude(lib/replace/getpass.m4)
 

Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/replace.h	2006-04-24 14:41:13 UTC (rev 15202)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h	2006-04-24 14:52:37 UTC (rev 15203)
@@ -202,7 +202,9 @@
 
 #ifdef HAVE_STDBOOL_H
 #include <stdbool.h>
-#else
+#endif
+
+#ifndef HAVE_BOOL
 #define __bool_true_false_are_defined
 typedef bool int;
 #define false (0)