From: Sean Bright <elixer@php.net>
Date: Wed, 17 Jan 2001 20:37:49 +0000 (+0000)
Subject: Put these back where they belong.  They weren't necessary unless ZTS and
X-Git-Tag: php-4.0.5RC1~539
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=457888ac449f247278d6d6da8603cce2490c85d4;p=php

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 4293d78730..05b14f1f55 100644
--- 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 c59f716e57..9193fd004e 100644
--- 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