Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix zts check
This commit is contained in:
Anatol Belski 2013-03-14 14:39:09 +01:00
commit 5df8cf1975

View File

@ -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);