From: Anatol Belski <ab@php.net>
Date: Thu, 14 Mar 2013 13:39:09 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0beta1~48^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5df8cf19759c77ee05fe6eecba7088caecbe132e;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix zts check
---

5df8cf19759c77ee05fe6eecba7088caecbe132e
diff --cc ext/pcre/php_pcre.c
index 20fb2a20b3,fe72dbc9c9..0d5d505fb7
--- a/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);