Added new constant; ZEND_MULTIBYTE to check whether PHP was compiled using --enable...

diff --git a/NEWS b/NEWS
index dab93c15c9b224d270ce7dab3276b672a6c4c185..c9c09fa4fef37193d1222fe3544b96d0fcfe944e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@
   (Andrey)
 - Improved support for is_link and related functions on Windows. (Pierre)
 
+- Implemented FR #52348, Ability to detect zend multibyte at runtime. (Kalle)
 - Implemented FR #52173, added functions pcntl_get_last_error() and 
   pcntl_strerror(). (nick dot telford at gmail dot com, Arnaud)
 - Implemented symbolic links support for open_basedir checks. (Pierre)

diff --git a/main/main.c b/main/main.c
index ab7df7ba511a7ff8fee7667bb5f225c9db9a7f10..b6073319ad13e250c4692582ab10cd9fc9d13f35 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1944,6 +1944,11 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
        REGISTER_MAIN_LONG_CONSTANT("PHP_MAXPATHLEN", MAXPATHLEN, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_LONG_CONSTANT("PHP_INT_MAX", LONG_MAX, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_LONG_CONSTANT("PHP_INT_SIZE", sizeof(long), CONST_PERSISTENT | CONST_CS);
+#ifdef ZEND_MULTIBYTE
+       REGISTER_MAIN_LONG_CONSTANT("ZEND_MULTIBYTE", 1, CONST_PERSISTENT | CONST_CS);
+#else
+       REGISTER_MAIN_LONG_CONSTANT("ZEND_MULTIBYTE", 0, CONST_PERSISTENT | CONST_CS);
+#endif
 
 #ifdef PHP_WIN32
        REGISTER_MAIN_LONG_CONSTANT("PHP_WINDOWS_VERSION_MAJOR",      EG(windows_version_info).dwMajorVersion, CONST_PERSISTENT | CONST_CS);