diff options
| author | Anatol Belski <ab@php.net> | 2013-03-14 14:39:47 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-03-14 14:39:47 +0100 |
| commit | 96388c78c978101a84dc2ccc8b02948f0fb5999f (patch) | |
| tree | 492efa4b48ac3ca38ee4b3fce6dd4868cb857f0c /ext/pcre/php_pcre.c | |
| parent | dd1c358d1bf8fd492e39d46f93878d47a3b6d257 (diff) | |
| parent | 5df8cf19759c77ee05fe6eecba7088caecbe132e (diff) | |
| download | php-git-96388c78c978101a84dc2ccc8b02948f0fb5999f.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix zts check
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index b1ee89a8a4..7d34d9feb1 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -251,7 +251,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(char *regex, int regex_le char *tmp = NULL; #if HAVE_SETLOCALE -# ifdef PHP_WIN32 && ZTS +# if defined(PHP_WIN32) && defined(ZTS) _configthreadlocale(_ENABLE_PER_THREAD_LOCALE); # endif locale = setlocale(LC_CTYPE, NULL); |