Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix zts check

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