From 1dbaae2795b756a3875c53da00b277f241cc04b8 Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@php.net>
Date: Thu, 15 Jun 2006 18:33:09 +0000
Subject: Added automatic module globals management

---
 ext/imap/php_imap.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'ext/imap/php_imap.c')

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 67be96b8e3..d4dc2cb000 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -80,6 +80,8 @@ unsigned long find_rightmost_bit(unsigned long *valptr);
 void fs_give(void **block);
 void *fs_get(size_t size);
 
+ZEND_DECLARE_MODULE_GLOBALS(imap)
+static PHP_GINIT_FUNCTION(imap);
 
 /* {{{ imap_functions[]
  */
@@ -175,12 +177,14 @@ zend_module_entry imap_module_entry = {
 	PHP_RSHUTDOWN(imap),
 	PHP_MINFO(imap),
 	NO_VERSION_YET,
-	STANDARD_MODULE_PROPERTIES
+	PHP_MODULE_GLOBALS(imap),
+	PHP_GINIT(imap),
+	NULL,
+	NULL,
+	STANDARD_MODULE_PROPERTIES_EX
 };
 /* }}} */
 
-ZEND_DECLARE_MODULE_GLOBALS(imap)
-
 #ifdef COMPILE_DL_IMAP
 ZEND_GET_MODULE(imap)
 #endif
@@ -397,9 +401,9 @@ void mail_getacl(MAILSTREAM *stream, char *mailbox, ACLLIST *alist)
 #endif
 
 
-/* {{{ php_imap_init_globals
+/* {{{ PHP_GINIT_FUNCTION
  */
-static void php_imap_init_globals(zend_imap_globals *imap_globals)
+static PHP_GINIT_FUNCTION(imap)
 {
 	imap_globals->imap_user = NIL;
 	imap_globals->imap_password = NIL;
@@ -433,8 +437,6 @@ PHP_MINIT_FUNCTION(imap)
 {
 	unsigned long sa_all =	SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY;
 
-	ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)
-
 #ifndef PHP_WIN32
 	mail_link(&unixdriver);		/* link in the unix driver */
 	mail_link(&mhdriver);		/* link in the mh driver */
-- 
cgit v1.2.1