CVS update: php31/main

Date: Tuesday September 1, 1998 @ 12:58 Author: shane Update of /repository/php31/main In directory asf:/u2/tmp/cvs-serv26737/main Modified Files: configuration-parser.y internal_functions.c phpsapi_core.dsp tls.h Log Message: Fix dl compile add registry functions for windows. These will be expanded for use in reading ini vars from registry. Index: php31/main/configuration-parser.y diff -c php31/main/configuration-parser.y:2.1 php31/main/configuration-parser.y:2.2 *** php31/main/configuration-parser.y:2.1 Thu Aug 20 17:50:31 1998 --- php31/main/configuration-parser.y Tue Sep 1 12:58:41 1998 *************** *** 30,36 **** ! /* $Id: configuration-parser.y,v 2.1 1998/08/20 21:50:31 zeev Exp $ */ #define DEBUG_CFG_PARSER 1 #ifdef THREAD_SAFE --- 30,36 ---- ! /* $Id: configuration-parser.y,v 2.2 1998/09/01 16:58:41 shane Exp $ */ #define DEBUG_CFG_PARSER 1 #ifdef THREAD_SAFE *************** *** 137,142 **** --- 137,150 ---- } + #if WIN32|WINNT + int reg_get_default_config(void){ + /* FIXME implement reading ini vars from registry, and inserting + into the hash */ + return 0; + } + #endif + int php3_init_config(void) { TLS_VARS; *************** *** 146,151 **** --- 154,163 ---- } #if USE_CONFIG_FILE + #if WIN32|WINNT + /*check to see if we can use the registry to get our variables*/ + if(!reg_get_default_config()) + #endif { char *env_location,*default_location,*php_ini_path; int safe_mode_state = php3_ini_master.safe_mode; Index: php31/main/internal_functions.c diff -c php31/main/internal_functions.c:2.5 php31/main/internal_functions.c:2.6 *** php31/main/internal_functions.c:2.5 Thu Aug 27 17:42:32 1998 --- php31/main/internal_functions.c Tue Sep 1 12:58:41 1998 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 2.5 1998/08/27 21:42:32 shane Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 2.6 1998/09/01 16:58:41 shane Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 83,88 **** --- 83,89 ---- #include "ext/snmp/php3_snmp.h" #include "ext/zlib/php3_zlib.h" #include "ext/com/php3_COM.h" + #include "os/nt/registry.h" #ifndef THREAD_SAFE HashTable list_destructors,module_registry; *************** *** 135,140 **** --- 136,142 ---- {"SNMP", snmp_module_ptr}, {"Pack/Unpack", pack_module_ptr}, {"Zlib", php3_zlib_module_ptr}, + {"Win32 Registry (Read Only)", php3_win32_reg_module_ptr}, {"Win32 COM", COM_module_ptr}, {NULL, NULL} }; Index: php31/main/phpsapi_core.dsp diff -c php31/main/phpsapi_core.dsp:2.9 php31/main/phpsapi_core.dsp:2.10 *** php31/main/phpsapi_core.dsp:2.9 Sun Aug 30 02:45:23 1998 --- php31/main/phpsapi_core.dsp Tue Sep 1 12:58:41 1998 *************** *** 345,350 **** --- 345,358 ---- # End Source File # Begin Source File + SOURCE=..\os\nt\registry.c + # End Source File + # Begin Source File + + SOURCE=..\os\nt\registry.h + # End Source File + # Begin Source File + SOURCE=..\os\nt\sendmail.c # End Source File # Begin Source File Index: php31/main/tls.h diff -c php31/main/tls.h:2.9 php31/main/tls.h:2.10 *** php31/main/tls.h:2.9 Thu Aug 27 16:55:45 1998 --- php31/main/tls.h Tue Sep 1 12:58:42 1998 *************** *** 204,209 **** --- 204,212 ---- LPMSG phpmsg; /*winutil*/ char Win_Error_msg[256]; + /*registry.c*/ + int registry_hkey_id; + int registry_le_hkey; #endif /*check for each module if it is compiled staticly we should include their globals here.*/ -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net