summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Zend/acconfig.h3
-rw-r--r--Zend/configure.in1
-rw-r--r--Zend/zend_globals.h10
3 files changed, 9 insertions, 5 deletions
diff --git a/Zend/acconfig.h b/Zend/acconfig.h
index 7a80526f55..13482bb3b3 100644
--- a/Zend/acconfig.h
+++ b/Zend/acconfig.h
@@ -11,6 +11,9 @@
/* 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 4ac9f9ec6d..1e1c9e950c 100644
--- a/Zend/configure.in
+++ b/Zend/configure.in
@@ -73,6 +73,7 @@ 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 )
dnl Checks for library functions.
AC_FUNC_VPRINTF
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index b9d4b61590..e679d00054 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -139,14 +139,14 @@ struct _zend_compiler_globals {
zend_llist filenames_list;
- unsigned char short_tags;
- unsigned char asp_tags;
+ zend_bool short_tags;
+ zend_bool asp_tags;
/* For extensions support */
- unsigned char extended_info; /* generate extension information for debugger/profiler */
- unsigned char handle_op_arrays; /* run op_arrays through op_array handlers */
+ zend_bool extended_info; /* generate extension information for debugger/profiler */
+ zend_bool handle_op_arrays; /* run op_arrays through op_array handlers */
- unsigned char unclean_shutdown;
+ zend_bool unclean_shutdown;
zend_llist open_files;
#ifdef ZTS