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/ldap/ldap.c | |
| parent | c3ed91477a011e494559d6f65301ef6b2e38cd22 (diff) | |
| download | php-git-1dbaae2795b756a3875c53da00b277f241cc04b8.tar.gz | |
Added automatic module globals management
Diffstat (limited to 'ext/ldap/ldap.c')
| -rw-r--r-- | ext/ldap/ldap.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 53a970e5d8..ac1e782b10 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -78,6 +78,7 @@ typedef struct { } ldap_resultentry; ZEND_DECLARE_MODULE_GLOBALS(ldap) +static PHP_GINIT_FUNCTION(ldap); static ZEND_BEGIN_ARG_INFO(arg3to6of6_force_ref, 0) @@ -177,7 +178,11 @@ zend_module_entry ldap_module_entry = { NULL, PHP_MINFO(ldap), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(ldap), + PHP_GINIT(ldap), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; #ifdef COMPILE_DL_LDAP @@ -222,9 +227,9 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ php_ldap_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_ldap_init_globals(zend_ldap_globals *ldap_globals) +static PHP_GINIT_FUNCTION(ldap) { ldap_globals->num_links = 0; } @@ -234,8 +239,6 @@ static void php_ldap_init_globals(zend_ldap_globals *ldap_globals) */ PHP_MINIT_FUNCTION(ldap) { - ZEND_INIT_MODULE_GLOBALS(ldap, php_ldap_init_globals, NULL); - REGISTER_INI_ENTRIES(); /* Constants to be used with deref-parameter in php_ldap_do_search() */ |