CVS update: php31/ext/standard

Date: Tuesday September 1, 1998 @ 12:58 Author: shane Update of /repository/php31/ext/standard In directory asf:/u2/tmp/cvs-serv26737/ext/standard Modified Files: basic_functions.c dl.c dl.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/ext/standard/basic_functions.c diff -c php31/ext/standard/basic_functions.c:2.10 php31/ext/standard/basic_functions.c:2.11 *** php31/ext/standard/basic_functions.c:2.10 Sun Aug 30 02:45:19 1998 --- php31/ext/standard/basic_functions.c Tue Sep 1 12:58:36 1998 *************** *** 74,79 **** --- 74,80 ---- #include "ext/standard/mail.h" #if WIN32|WINNT #include "os/nt/unistd.h" + #include "os/nt/registry.h" #endif static unsigned char second_and_third_args_force_ref[] = { 3, BYREF_NONE, BYREF_FORCE, BYREF_FORCE }; *************** *** 283,289 **** --- 284,292 ---- }; #if HAVE_PUTENV + #ifndef THREAD_SAFE static HashTable putenv_ht; + #endif static void _php3_putenv_destructor(putenv_entry *pe) { Index: php31/ext/standard/dl.c diff -c php31/ext/standard/dl.c:2.6 php31/ext/standard/dl.c:2.7 *** php31/ext/standard/dl.c:2.6 Sun Aug 30 02:45:19 1998 --- php31/ext/standard/dl.c Tue Sep 1 12:58:36 1998 *************** *** 99,114 **** /* FIXME HELPME we need to have some way to check if the dl is already loaded before going through all this stuff. */ ! if(_php3_dl(file->value.str.val,MODULE_TEMPORARY,return_value,NULL _INLINE_TLS)==FAILURE) RETURN_FALSE; } RETURN_TRUE; } - int _php3_dl(char *file,int type,pval *return_value, dl_plist *thisdl INLINE_TLS) { void *handle; char filename[MAXPATHLEN + 1]; --- 99,120 ---- /* FIXME HELPME we need to have some way to check if the dl is already loaded before going through all this stuff. */ ! #if THREAD_SAFE if(_php3_dl(file->value.str.val,MODULE_TEMPORARY,return_value,NULL _INLINE_TLS)==FAILURE) + #else + if(_php3_dl(file->value.str.val,MODULE_TEMPORARY,return_value)==FAILURE) + #endif RETURN_FALSE; } RETURN_TRUE; } + #if THREAD_SAFE int _php3_dl(char *file,int type,pval *return_value, dl_plist *thisdl INLINE_TLS) + #else + int _php3_dl(char *file,int type,pval *return_value) + #endif { void *handle; char filename[MAXPATHLEN + 1]; Index: php31/ext/standard/dl.h diff -c php31/ext/standard/dl.h:2.2 php31/ext/standard/dl.h:2.3 *** php31/ext/standard/dl.h:2.2 Fri Aug 28 16:35:29 1998 --- php31/ext/standard/dl.h Tue Sep 1 12:58:36 1998 *************** *** 30,36 **** */ ! /* $Id: dl.h,v 2.2 1998/08/28 20:35:29 shane Exp $ */ #ifndef _DL_H #define _DL_H --- 30,36 ---- */ ! /* $Id: dl.h,v 2.3 1998/09/01 16:58:36 shane Exp $ */ #ifndef _DL_H #define _DL_H *************** *** 58,68 **** extern int php3_mshutdown_dl(void); extern int php3_rshutdown_dl(void); extern void php3_info_dl(void); extern int _php3_dl(char *file,int type,pval *return_value, dl_plist *ins INLINE_TLS); extern void php3_dlload(INLINE_TLS_VOID); extern void php3_dladd(char *dlname); extern void php3_dllist_clear(void); ! #else #define dl_module_ptr NULL --- 58,71 ---- extern int php3_mshutdown_dl(void); extern int php3_rshutdown_dl(void); extern void php3_info_dl(void); + #ifndef THREAD_SAFE + extern int _php3_dl(char *file,int type,pval *return_value); + #else extern int _php3_dl(char *file,int type,pval *return_value, dl_plist *ins INLINE_TLS); extern void php3_dlload(INLINE_TLS_VOID); extern void php3_dladd(char *dlname); extern void php3_dllist_clear(void); ! #endif #else #define dl_module_ptr NULL -- 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