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/sockets | |
| parent | c3ed91477a011e494559d6f65301ef6b2e38cd22 (diff) | |
| download | php-git-1dbaae2795b756a3875c53da00b277f241cc04b8.tar.gz | |
Added automatic module globals management
Diffstat (limited to 'ext/sockets')
| -rw-r--r-- | ext/sockets/sockets.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index d706674baf..893f5cefe5 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -57,6 +57,7 @@ #endif ZEND_DECLARE_MODULE_GLOBALS(sockets) +static PHP_GINIT_FUNCTION(sockets); #ifndef MSG_WAITALL #ifdef LINUX @@ -159,7 +160,11 @@ zend_module_entry sockets_module_entry = { PHP_RSHUTDOWN(sockets), PHP_MINFO(sockets), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(sockets), + PHP_GINIT(sockets), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; @@ -432,7 +437,7 @@ static int php_set_inet_addr(struct sockaddr_in *sin, char *string, php_socket * return 1; } -static void php_sockets_init_globals(zend_sockets_globals *sockets_globals TSRMLS_DC) +static PHP_GINIT_FUNCTION(sockets) { sockets_globals->last_error = 0; sockets_globals->strerror_buf = NULL; @@ -444,8 +449,6 @@ PHP_MINIT_FUNCTION(sockets) { struct protoent *pe; - ZEND_INIT_MODULE_GLOBALS(sockets, php_sockets_init_globals, NULL); - le_socket = zend_register_list_destructors_ex(php_destroy_socket, NULL, le_socket_name, module_number); REGISTER_LONG_CONSTANT("AF_UNIX", AF_UNIX, CONST_CS | CONST_PERSISTENT); |