Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix zts check

diff --cc ext/pcre/php_pcre.c
index 20fb2a20b3000ef99db91c3e910a3687c895b857,fe72dbc9c9e82f1d0d68a30026850fc9dc1229a3..0d5d505fb7f2d4aa3ed2bb79a757549e7f6fe2ed
--- 1/ext/pcre/php_pcre.c
--- 2/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@@ -248,10 -248,9 +248,10 @@@ PHPAPI pcre_cache_entry* pcre_get_compi
  #endif
        pcre_cache_entry        *pce;
        pcre_cache_entry         new_entry;
 +      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);