summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalle Sommer Nielsen <kalle@php.net>2010-11-11 01:43:53 +0000
committerKalle Sommer Nielsen <kalle@php.net>2010-11-11 01:43:53 +0000
commit584ddb0c6e308c87ee69c45696bd4b481ee866c2 (patch)
treeb8c01d0accd880f589832734dd4bf38e0b1c979f
parent469746fa03c1c1b8af67e93edee3816ac1f79da2 (diff)
downloadphp-git-584ddb0c6e308c87ee69c45696bd4b481ee866c2.tar.gz
Added new constant; ZEND_MULTIBYTE to check whether PHP was compiled using --enable-zend-multibyte or not instead of sniffing phpinfo() (FR #52348)
-rw-r--r--main/main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/main.c b/main/main.c
index e6d7ab07e0..223830aab5 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1979,6 +1979,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);