workaround for 64-bit platforms

diff --git a/Zend/acconfig.h b/Zend/acconfig.h
index 13482bb3b3a58e3b270b2a25bc0514a56298859d..7a80526f5529ffa3914eb2b0e777ea1d4ea65f54 100644 (file)
--- a/Zend/acconfig.h
+++ b/Zend/acconfig.h
@@ -11,9 +11,6 @@
 /* define ulong by configure if it is missed (most probably is) */
 #undef ulong
 
-/* define zend_bool by configure */
-#undef zend_bool
-
 /* type check for in_addr_t */
 #undef in_addr_t
 

diff --git a/Zend/configure.in b/Zend/configure.in
index 1e1c9e950c03cdd2c7419cc40d9c6f4af59bc4af..f60dde5fe71365b24854c10189e4fd55a719eacb 100644 (file)
--- a/Zend/configure.in
+++ b/Zend/configure.in
@@ -73,7 +73,8 @@ AC_TYPE_SIZE_T
 dnl This is required for QNX and may be some BSD derived systems
 AC_CHECK_TYPE( uint, unsigned int )
 AC_CHECK_TYPE( ulong, unsigned long )
-AC_CHECK_TYPE( zend_bool, unsigned char )
+
+AC_CHECK_SIZEOF(int, 4)
 
 dnl Checks for library functions.
 AC_FUNC_VPRINTF

diff --git a/Zend/zend.h b/Zend/zend.h
index 9cf2faf218d55b47fa851b3f28d007a9c93b95ca..a9e05a77e55074158b7a975cf6c71830df46c698 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -45,6 +45,11 @@
 #include "zend_errors.h"
 #include "zend_alloc.h"
 
+#if SIZEOF_INT == 8
+typedef unsigned int zend_bool;
+#else
+typedef unsigned char zend_bool;
+#endif
 
 #undef SUCCESS
 #undef FAILURE