diff options
| author | Sean Bright <elixer@php.net> | 2001-01-17 20:37:49 +0000 |
|---|---|---|
| committer | Sean Bright <elixer@php.net> | 2001-01-17 20:37:49 +0000 |
| commit | 457888ac449f247278d6d6da8603cce2490c85d4 (patch) | |
| tree | d3f7bfcac0860ddbeaceac85fa8960fd3fe7226c | |
| parent | 62606e7789054fc036a6ccc892e8988a2f0c69ba (diff) | |
| download | php-git-457888ac449f247278d6d6da8603cce2490c85d4.tar.gz | |
Put these back where they belong. They weren't necessary unless ZTS and
HAVE_LOCALECONV were both defined.
| -rw-r--r-- | ext/standard/basic_functions.c | 4 | ||||
| -rw-r--r-- | ext/standard/php_string.h | 2 |
2 files changed, 3 insertions, 3 deletions
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 |