cvs: php4 /ext/standard basic_functions.c file.c info.c /main main.c php_ini.c /win32 php4dll.dsp
| From: | Zeev Suraski | Date: | Wed, 27 Dec 2000 15:43:06 +0000 |
| Subject: | cvs: php4 /ext/standard basic_functions.c file.c info.c /main main.c php_ini.c /win32 php4dll.dsp | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3309@lists.php.net to get a copy of this message | ||
zeev Wed Dec 27 07:43:06 2000 EDT
Modified files:
/php4/ext/standard basic_functions.c file.c info.c
/php4/main main.c php_ini.c
/php4/win32 php4dll.dsp
Log:
- Make the INI mechanism thread safe (fix necessary API changes from Zend)
- Make the Win32 non-TS configuration build again
Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.290 php4/ext/standard/basic_functions.c:1.291 --- php4/ext/standard/basic_functions.c:1.290 Wed Dec 20 03:07:20 2000 +++ php4/ext/standard/basic_functions.c Wed Dec 27 07:43:05 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.290 2000/12/20 11:07:20 zak Exp $ */ +/* $Id: basic_functions.c,v 1.291 2000/12/27 15:43:05 zeev Exp $ */ #include "php.h" #include "php_main.h" @@ -426,7 +426,7 @@ PHP_FALIAS(socket_set_timeout, warn_not_available, NULL) #endif PHP_FE(socket_get_status, NULL) -#if !PHP_WIN32 || defined(ZTS) +#if !defined(PHP_WIN32) || defined(ZTS) PHP_FE(realpath, NULL) #else PHP_FALIAS(realpath, warn_not_available, NULL) Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.131 php4/ext/standard/file.c:1.132 --- php4/ext/standard/file.c:1.131 Fri Dec 22 11:26:02 2000 +++ php4/ext/standard/file.c Wed Dec 27 07:43:05 2000 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.131 2000/12/22 19:26:02 sas Exp $ */ +/* $Id: file.c,v 1.132 2000/12/27 15:43:05 zeev Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -1924,6 +1924,8 @@ /* }}} */ + +#if !defined(PHP_WIN32) || defined(ZTS) /* {{{ proto string realpath(string path) Return the resolved path */ PHP_FUNCTION(realpath) @@ -1944,6 +1946,8 @@ } } /* }}} */ +#endif + #if 0 Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.126 php4/ext/standard/info.c:1.127 --- php4/ext/standard/info.c:1.126 Fri Dec 22 04:57:08 2000 +++ php4/ext/standard/info.c Wed Dec 27 07:43:05 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.126 2000/12/22 12:57:08 zeev Exp $ */ +/* $Id: info.c,v 1.127 2000/12/27 15:43:05 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -239,7 +239,7 @@ PUTS("</a></h1>\n"); } - zend_ini_sort_entries(); + zend_ini_sort_entries(ELS_C); if (flag & PHP_INFO_CONFIGURATION) { php_info_print_hr(); Index: php4/main/main.c diff -u php4/main/main.c:1.343 php4/main/main.c:1.344 --- php4/main/main.c:1.343 Tue Nov 28 17:02:27 2000 +++ php4/main/main.c Wed Dec 27 07:43:05 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.343 2000/11/29 01:02:27 zeev Exp $ */ +/* $Id: main.c,v 1.344 2000/12/27 15:43:05 zeev Exp $ */ #include <stdio.h> @@ -680,11 +680,7 @@ if (PG(modules_activated)) { zend_deactivate_modules(); } - - if (setjmp(EG(bailout))==0) { - zend_ini_rshutdown(); - } - + zend_deactivate(CLS_C ELS_CC); if (setjmp(EG(bailout))==0) { @@ -725,13 +721,6 @@ return php_body_write(str, str_length); } -#ifdef ZTS -static void php_new_thread_end_handler(THREAD_T thread_id) -{ - zend_ini_refresh_caches(PHP_INI_STAGE_STARTUP); -} -#endif - #ifdef ZTS static void core_globals_ctor(php_core_globals *core_globals) @@ -843,7 +832,6 @@ zend_startup(&zuf, NULL, 1); #ifdef ZTS - tsrm_set_new_thread_end_handler(php_new_thread_end_handler); executor_globals = ts_resource(executor_globals_id); core_globals_id = ts_allocate_id(sizeof(php_core_globals), (ts_allocate_ctor) core_globals_ctor, NULL); core_globals = ts_resource(core_globals_id); @@ -872,8 +860,6 @@ le_index_ptr = zend_register_list_destructors_ex(NULL, NULL, "index pointer", 0); FREE_MUTEX(gLock); - zend_ini_mstartup(); - if (php_config_ini_startup() == FAILURE) { return FAILURE; } @@ -953,7 +939,9 @@ php_shutdown_fopen_wrappers(); php_shutdown_info_logos(); UNREGISTER_INI_ENTRIES(); - zend_ini_mshutdown(); +#ifndef ZTS + zend_ini_shutdown(ELS_C); +#endif shutdown_memory_manager(0, 1); module_initialized = 0; } Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.44 php4/main/php_ini.c:1.45 --- php4/main/php_ini.c:1.44 Tue Oct 31 08:06:46 2000 +++ php4/main/php_ini.c Wed Dec 27 07:43:05 2000 @@ -77,6 +77,7 @@ PHPAPI void display_ini_entries(zend_module_entry *module) { int module_number; + ELS_FETCH(); if (module) { module_number = module->module_number; @@ -85,7 +86,7 @@ } php_info_print_table_start(); php_info_print_table_header(3, "Directive", "Local Value", "Master Value"); - zend_ini_apply_with_argument((apply_func_arg_t) php_ini_displayer, (void *) (long) module_number); + zend_hash_apply_with_argument(&EG(ini_directives), (apply_func_arg_t) php_ini_displayer, (void *) (long) module_number); php_info_print_table_end(); } Index: php4/win32/php4dll.dsp diff -u php4/win32/php4dll.dsp:1.6 php4/win32/php4dll.dsp:1.7 --- php4/win32/php4dll.dsp:1.6 Thu Nov 2 06:53:10 2000 +++ php4/win32/php4dll.dsp Wed Dec 27 07:43:05 2000 @@ -333,6 +333,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\credits.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\datetime.c # End Source File # Begin Source File @@ -445,10 +449,6 @@ # End Source File # Begin Source File -SOURCE=..\ext\bcmath\number.c -# End Source File -# Begin Source File - SOURCE=..\ext\standard\pack.c # End Source File # Begin Source File @@ -609,10 +609,6 @@ # End Source File # Begin Source File -SOURCE=..\ext\bcmath\number.h -# End Source File -# Begin Source File - SOURCE=..\ext\standard\pageinfo.h # End Source File # Begin Source File @@ -996,6 +992,513 @@ # Begin Source File SOURCE=..\ext\calendar\sdncal.h +# End Source File +# End Group +# End Group +# Begin Group "bcmath" + +# PROP Default_Filter "" +# Begin Group "Source Files No. 8" + +# PROP Default_Filter ".c" +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\add.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\compare.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\debug.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\div.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\divmod.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\init.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\int2num.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\neg.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\num2long.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\num2str.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\output.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\raise.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\recmul.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\rt.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\str2num.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\sub.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\zero.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# End Group +# Begin Group "Header Files No. 8" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\config.h +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\private.h # End Source File # End Group # End Group
Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.290 php4/ext/standard/basic_functions.c:1.291 --- php4/ext/standard/basic_functions.c:1.290 Wed Dec 20 03:07:20 2000 +++ php4/ext/standard/basic_functions.c Wed Dec 27 07:43:05 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.290 2000/12/20 11:07:20 zak Exp $ */ +/* $Id: basic_functions.c,v 1.291 2000/12/27 15:43:05 zeev Exp $ */ #include "php.h" #include "php_main.h" @@ -426,7 +426,7 @@ PHP_FALIAS(socket_set_timeout, warn_not_available, NULL) #endif PHP_FE(socket_get_status, NULL) -#if !PHP_WIN32 || defined(ZTS) +#if !defined(PHP_WIN32) || defined(ZTS) PHP_FE(realpath, NULL) #else PHP_FALIAS(realpath, warn_not_available, NULL) Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.131 php4/ext/standard/file.c:1.132 --- php4/ext/standard/file.c:1.131 Fri Dec 22 11:26:02 2000 +++ php4/ext/standard/file.c Wed Dec 27 07:43:05 2000 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.131 2000/12/22 19:26:02 sas Exp $ */ +/* $Id: file.c,v 1.132 2000/12/27 15:43:05 zeev Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -1924,6 +1924,8 @@ /* }}} */ + +#if !defined(PHP_WIN32) || defined(ZTS) /* {{{ proto string realpath(string path) Return the resolved path */ PHP_FUNCTION(realpath) @@ -1944,6 +1946,8 @@ } } /* }}} */ +#endif + #if 0 Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.126 php4/ext/standard/info.c:1.127 --- php4/ext/standard/info.c:1.126 Fri Dec 22 04:57:08 2000 +++ php4/ext/standard/info.c Wed Dec 27 07:43:05 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.126 2000/12/22 12:57:08 zeev Exp $ */ +/* $Id: info.c,v 1.127 2000/12/27 15:43:05 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -239,7 +239,7 @@ PUTS("</a></h1>\n"); } - zend_ini_sort_entries(); + zend_ini_sort_entries(ELS_C); if (flag & PHP_INFO_CONFIGURATION) { php_info_print_hr(); Index: php4/main/main.c diff -u php4/main/main.c:1.343 php4/main/main.c:1.344 --- php4/main/main.c:1.343 Tue Nov 28 17:02:27 2000 +++ php4/main/main.c Wed Dec 27 07:43:05 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.343 2000/11/29 01:02:27 zeev Exp $ */ +/* $Id: main.c,v 1.344 2000/12/27 15:43:05 zeev Exp $ */ #include <stdio.h> @@ -680,11 +680,7 @@ if (PG(modules_activated)) { zend_deactivate_modules(); } - - if (setjmp(EG(bailout))==0) { - zend_ini_rshutdown(); - } - + zend_deactivate(CLS_C ELS_CC); if (setjmp(EG(bailout))==0) { @@ -725,13 +721,6 @@ return php_body_write(str, str_length); } -#ifdef ZTS -static void php_new_thread_end_handler(THREAD_T thread_id) -{ - zend_ini_refresh_caches(PHP_INI_STAGE_STARTUP); -} -#endif - #ifdef ZTS static void core_globals_ctor(php_core_globals *core_globals) @@ -843,7 +832,6 @@ zend_startup(&zuf, NULL, 1); #ifdef ZTS - tsrm_set_new_thread_end_handler(php_new_thread_end_handler); executor_globals = ts_resource(executor_globals_id); core_globals_id = ts_allocate_id(sizeof(php_core_globals), (ts_allocate_ctor) core_globals_ctor, NULL); core_globals = ts_resource(core_globals_id); @@ -872,8 +860,6 @@ le_index_ptr = zend_register_list_destructors_ex(NULL, NULL, "index pointer", 0); FREE_MUTEX(gLock); - zend_ini_mstartup(); - if (php_config_ini_startup() == FAILURE) { return FAILURE; } @@ -953,7 +939,9 @@ php_shutdown_fopen_wrappers(); php_shutdown_info_logos(); UNREGISTER_INI_ENTRIES(); - zend_ini_mshutdown(); +#ifndef ZTS + zend_ini_shutdown(ELS_C); +#endif shutdown_memory_manager(0, 1); module_initialized = 0; } Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.44 php4/main/php_ini.c:1.45 --- php4/main/php_ini.c:1.44 Tue Oct 31 08:06:46 2000 +++ php4/main/php_ini.c Wed Dec 27 07:43:05 2000 @@ -77,6 +77,7 @@ PHPAPI void display_ini_entries(zend_module_entry *module) { int module_number; + ELS_FETCH(); if (module) { module_number = module->module_number; @@ -85,7 +86,7 @@ } php_info_print_table_start(); php_info_print_table_header(3, "Directive", "Local Value", "Master Value"); - zend_ini_apply_with_argument((apply_func_arg_t) php_ini_displayer, (void *) (long) module_number); + zend_hash_apply_with_argument(&EG(ini_directives), (apply_func_arg_t) php_ini_displayer, (void *) (long) module_number); php_info_print_table_end(); } Index: php4/win32/php4dll.dsp diff -u php4/win32/php4dll.dsp:1.6 php4/win32/php4dll.dsp:1.7 --- php4/win32/php4dll.dsp:1.6 Thu Nov 2 06:53:10 2000 +++ php4/win32/php4dll.dsp Wed Dec 27 07:43:05 2000 @@ -333,6 +333,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\credits.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\datetime.c # End Source File # Begin Source File @@ -445,10 +449,6 @@ # End Source File # Begin Source File -SOURCE=..\ext\bcmath\number.c -# End Source File -# Begin Source File - SOURCE=..\ext\standard\pack.c # End Source File # Begin Source File @@ -609,10 +609,6 @@ # End Source File # Begin Source File -SOURCE=..\ext\bcmath\number.h -# End Source File -# Begin Source File - SOURCE=..\ext\standard\pageinfo.h # End Source File # Begin Source File @@ -996,6 +992,513 @@ # Begin Source File SOURCE=..\ext\calendar\sdncal.h +# End Source File +# End Group +# End Group +# Begin Group "bcmath" + +# PROP Default_Filter "" +# Begin Group "Source Files No. 8" + +# PROP Default_Filter ".c" +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\add.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\compare.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\debug.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\div.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\divmod.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\init.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\int2num.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\neg.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\num2long.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\num2str.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\output.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\raise.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\recmul.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\rt.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\str2num.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\sub.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\zero.c + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" + +# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release" +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" + +# ADD CPP /I "..\ext\mysql\libmysql" /I "..\ext\bcmath\libbcmath\src" + +!ENDIF + +# End Source File +# End Group +# Begin Group "Header Files No. 8" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\config.h +# End Source File +# Begin Source File + +SOURCE=..\ext\bcmath\libbcmath\src\private.h # End Source File # End Group # End Group