[PHP4BETA] CVS update: php4/functions

Date: Sunday April 11, 1999 @ 6:04 Author: thies Update of /repository/php4/functions In directory php:/tmp/cvs-serv16075/functions Modified Files: oci8.c oracle.c Log Message: compiles & ora_*** seems working Index: php4/functions/oci8.c diff -u php4/functions/oci8.c:1.2 php4/functions/oci8.c:1.3 --- php4/functions/oci8.c:1.2 Thu Apr 8 17:32:57 1999 +++ php4/functions/oci8.c Sun Apr 11 06:04:48 1999 @@ -30,7 +30,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.2 1999/04/08 21:32:57 zeev Exp $ */ +/* $Id: oci8.c,v 1.3 1999/04/11 10:04:48 thies Exp $ */ #include "php.h" #include "php3_oci8.h" @@ -275,7 +275,7 @@ } -int php3_mshutdown_oci8() +int php3_mshutdown_oci8(SHUTDOWN_FUNC_ARGS) { #ifdef THREAD_SAFE oci8_global_struct *oci8_globals; @@ -299,7 +299,7 @@ } -int php3_rshutdown_oci8() +int php3_rshutdown_oci8(SHUTDOWN_FUNC_ARGS) { return SUCCESS; } Index: php4/functions/oracle.c diff -u php4/functions/oracle.c:1.2 php4/functions/oracle.c:1.3 --- php4/functions/oracle.c:1.2 Thu Apr 8 17:32:57 1999 +++ php4/functions/oracle.c Sun Apr 11 06:04:48 1999 @@ -47,6 +47,7 @@ #include "build-defs.h" #endif #include "snprintf.h" +#include "zend_globals.h" #ifndef min #define min(a, b) ((a) > (b) ? (b) : (a)) @@ -1683,7 +1684,7 @@ return 0; } #else - if(_php3_hash_find(&GLOBAL(symbol_table), paramname, strlen(paramname) + 1, (void **)&pdata) == FAILURE){ + if(_php3_hash_find(&EG(symbol_table), paramname, strlen(paramname) + 1, (void **)&pdata) == FAILURE){ php3_error(E_WARNING, "Can't find variable for parameter"); efree(paramname); return 0; -- PHP 4 Beta