diff options
Diffstat (limited to 'ext/oci8/oci8.c')
-rw-r--r-- | ext/oci8/oci8.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 30d287d460..c5aad2ab1a 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -50,6 +50,7 @@ #include "php_oci8_int.h" ZEND_DECLARE_MODULE_GLOBALS(oci) +static PHP_GINIT_FUNCTION(oci); /* True globals, no need for thread safety */ int le_connection; @@ -371,7 +372,11 @@ zend_module_entry oci8_module_entry = { PHP_RSHUTDOWN(oci), /* per-request shutdown function */ PHP_MINFO(oci), /* information function */ "1.1", - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(oci), /* globals descriptor */ + PHP_GINIT(oci), /* globals ctor */ + NULL, /* globals dtor */ + NULL, /* post deactivate */ + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ @@ -454,10 +459,10 @@ static void php_oci_cleanup_global_handles(TSRMLS_D) } } /* }}} */ -/* {{{ php_oci_init_globals() +/* {{{ PHP_GINIT_FUNCTION Zerofill globals during module init */ -static void php_oci_init_globals(zend_oci_globals *oci_globals TSRMLS_DC) +static PHP_GINIT_FUNCTION(oci) { memset(oci_globals, 0, sizeof(zend_oci_globals)); } @@ -486,7 +491,6 @@ PHP_MINIT_FUNCTION(oci) OCIInitialize(PHP_OCI_INIT_MODE, NULL, NULL, NULL, NULL); #endif - ZEND_INIT_MODULE_GLOBALS(oci, php_oci_init_globals, NULL); REGISTER_INI_ENTRIES(); le_statement = zend_register_list_destructors_ex(php_oci_statement_list_dtor, NULL, "oci8 statement", module_number); |