cvs: php4 /ext/standard basic_functions.c php_string.h

elixer Wed Jan 17 12:37:49 2001 EDT Modified files: /php4/ext/standard basic_functions.c php_string.h Log: Put these back where they belong. They weren't necessary unless ZTS and HAVE_LOCALECONV were both defined. Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.298 php4/ext/standard/basic_functions.c:1.299 --- php4/ext/standard/basic_functions.c:1.298 Tue Jan 16 17:10:50 2001 +++ php4/ext/standard/basic_functions.c Wed Jan 17 12:37:48 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.298 2001/01/17 01:10:50 elixer Exp $ */ +/* $Id: basic_functions.c,v 1.299 2001/01/17 20:37:48 elixer Exp $ */ #include "php.h" #include "php_main.h" @@ -719,7 +719,7 @@ 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(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 Index: php4/ext/standard/php_string.h diff -u php4/ext/standard/php_string.h:1.34 php4/ext/standard/php_string.h:1.35 --- php4/ext/standard/php_string.h:1.34 Tue Jan 16 17:10:50 2001 +++ php4/ext/standard/php_string.h Wed Jan 17 12:37:49 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_string.h,v 1.34 2001/01/17 01:10:50 elixer Exp $ */ +/* $Id: php_string.h,v 1.35 2001/01/17 20:37:49 elixer Exp $ */ /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */ @@ -84,7 +84,7 @@ #endif -#ifdef ZTS +#if defined(HAVE_LOCALECONV) && defined(ZTS) PHP_MINIT_FUNCTION(localeconv); PHP_MSHUTDOWN_FUNCTION(localeconv); #endif