Put these back where they belong. They weren't necessary unless ZTS and

HAVE_LOCALECONV were both defined.

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 4293d7873027066eab0a224e00f8fc217b320e1a..05b14f1f5573c38a6606786346e88bf5278769d9 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -719,7 +719,7 @@ PHP_MINIT_FUNCTION(basic)
        PHP_MINIT(pack)(INIT_FUNC_ARGS_PASSTHRU);
        PHP_MINIT(browscap)(INIT_FUNC_ARGS_PASSTHRU);
        PHP_MINIT(lcg)(INIT_FUNC_ARGS_PASSTHRU);
-#ifdef ZTS
+#if defined(HAVE_LOCALECONV) && defined(ZTS)
        PHP_MINIT(localeconv)(INIT_FUNC_ARGS_PASSTHRU);
 #endif
 
@@ -778,7 +778,7 @@ PHP_MSHUTDOWN_FUNCTION(basic)
        PHP_MSHUTDOWN(url_scanner_ex)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
 #endif
        PHP_MSHUTDOWN(file)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
-#ifdef ZTS
+#if defined(HAVE_LOCALECONV) && defined(ZTS)
        PHP_MSHUTDOWN(localeconv)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
 #endif
 

diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h
index c59f716e57361b07f18a77a403a064bcdd07a3ef..9193fd004ea3304530491a292aacee0b12a5c1bf 100644 (file)
--- a/ext/standard/php_string.h
+++ b/ext/standard/php_string.h
@@ -84,7 +84,7 @@ PHP_FUNCTION(strcoll);
 #endif
 
 
-#ifdef ZTS
+#if defined(HAVE_LOCALECONV) && defined(ZTS)
 PHP_MINIT_FUNCTION(localeconv);
 PHP_MSHUTDOWN_FUNCTION(localeconv);
 #endif