diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-06-13 13:12:20 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-06-13 13:12:20 +0000 |
| commit | 943960c324597281c02c42ae2ead2c2d7ef01be7 (patch) | |
| tree | 52a64885afab0efae220d8bd3eb2867b1022f8e7 /ext/date/php_date.c | |
| parent | 2cbde06400d2caf58d7f789b828f8d663980c8d2 (diff) | |
| download | php-git-943960c324597281c02c42ae2ead2c2d7ef01be7.tar.gz | |
Added automatic module globals management
Diffstat (limited to 'ext/date/php_date.c')
| -rw-r--r-- | ext/date/php_date.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 64b59f8118..803298d1e8 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -232,6 +232,7 @@ static void date_register_classes(TSRMLS_D); /* }}} */ ZEND_DECLARE_MODULE_GLOBALS(date) +static PHP_GINIT_FUNCTION(date); /* True global */ timelib_tzdb *php_date_global_timezone_db; @@ -311,13 +312,17 @@ zend_module_entry date_module_entry = { PHP_RSHUTDOWN(date), /* request shutdown */ PHP_MINFO(date), /* extension info */ PHP_VERSION, /* extension version */ - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(date), /* globals descriptor */ + PHP_GINIT(date), /* globals ctor */ + NULL, /* globals dtor */ + NULL, /* post deactivate */ + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ -/* {{{ php_date_init_globals */ -static void php_date_init_globals(zend_date_globals *date_globals) +/* {{{ PHP_GINIT_FUNCTION */ +static PHP_GINIT_FUNCTION(date) { date_globals->default_timezone = NULL; date_globals->timezone = NULL; @@ -457,7 +462,6 @@ PHP_RSHUTDOWN_FUNCTION(date) /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(date) { - ZEND_INIT_MODULE_GLOBALS(date, php_date_init_globals, NULL); REGISTER_INI_ENTRIES(); date_register_classes(TSRMLS_C); |