diff options
| author | Anatol Belski <ab@php.net> | 2013-03-14 14:39:09 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-03-14 14:39:09 +0100 |
| commit | 5df8cf19759c77ee05fe6eecba7088caecbe132e (patch) | |
| tree | f5a036fe5ef01f150313506ace6fa69f591ae54a /ext/pcre | |
| parent | 0777a18703d9be2ea8efd85c0352863b8768e49e (diff) | |
| parent | e43c5a83957c6a9953a74b5403a5f1d5ae341770 (diff) | |
| download | php-git-5df8cf19759c77ee05fe6eecba7088caecbe132e.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix zts check
Diffstat (limited to 'ext/pcre')
| -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 20fb2a20b3..0d5d505fb7 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); |