diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-06-15 18:33:09 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-06-15 18:33:09 +0000 |
| commit | 1dbaae2795b756a3875c53da00b277f241cc04b8 (patch) | |
| tree | fd516b57354eb9480e89dcd0503fa990d3cc2068 /ext/mysqli/mysqli.c | |
| parent | c3ed91477a011e494559d6f65301ef6b2e38cd22 (diff) | |
| download | php-git-1dbaae2795b756a3875c53da00b277f241cc04b8.tar.gz | |
Added automatic module globals management
Diffstat (limited to 'ext/mysqli/mysqli.c')
| -rw-r--r-- | ext/mysqli/mysqli.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index cad94021e8..cd7121046d 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -35,6 +35,8 @@ #define MYSQLI_USE_RESULT 1 ZEND_DECLARE_MODULE_GLOBALS(mysqli) +static PHP_GINIT_FUNCTION(mysqli); + static zend_object_handlers mysqli_object_handlers; static HashTable classes; static HashTable mysqli_driver_properties; @@ -367,7 +369,11 @@ zend_module_entry mysqli_module_entry = { PHP_RSHUTDOWN(mysqli), PHP_MINFO(mysqli), "0.1", /* Replace with version number for your extension */ - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(mysqli), + PHP_GINIT(mysqli), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ @@ -389,9 +395,9 @@ PHP_INI_END() /* }}} */ -/* {{{ php_mysqli_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_mysqli_init_globals(zend_mysqli_globals *mysqli_globals) +static PHP_GINIT_FUNCTION(mysqli) { mysqli_globals->num_links = 0; mysqli_globals->max_links = 0; @@ -418,7 +424,6 @@ PHP_MINIT_FUNCTION(mysqli) zend_class_entry *ce,cex; zend_object_handlers *std_hnd = zend_get_std_object_handlers(); - ZEND_INIT_MODULE_GLOBALS(mysqli, php_mysqli_init_globals, NULL); REGISTER_INI_ENTRIES(); memcpy(&mysqli_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); |