From 943960c324597281c02c42ae2ead2c2d7ef01be7 Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@php.net>
Date: Tue, 13 Jun 2006 13:12:20 +0000
Subject: Added automatic module globals management

---
 ext/odbc/php_odbc.c | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'ext/odbc/php_odbc.c')

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 17285cf10d..65eeff05b0 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -130,6 +130,9 @@ zend_function_entry odbc_functions[] = {
 };
 /* }}} */
 
+ZEND_DECLARE_MODULE_GLOBALS(odbc);
+static PHP_GINIT_FUNCTION(odbc);
+
 /* {{{ odbc_module_entry
  */
 zend_module_entry odbc_module_entry = {
@@ -142,16 +145,14 @@ zend_module_entry odbc_module_entry = {
 	PHP_RSHUTDOWN(odbc), 
 	PHP_MINFO(odbc), 
 	"1.0",
-	STANDARD_MODULE_PROPERTIES
+	PHP_MODULE_GLOBALS(odbc),
+	PHP_GINIT(odbc),
+	NULL,
+	NULL,
+	STANDARD_MODULE_PROPERTIES_EX
 };
 /* }}} */
 
-#ifdef ZTS
-int odbc_globals_id;
-#else
-ZEND_API php_odbc_globals odbc_globals;
-#endif
-
 #ifdef COMPILE_DL_ODBC
 ZEND_GET_MODULE(odbc)
 # ifdef PHP_WIN32
@@ -403,12 +404,10 @@ PHP_INI_BEGIN()
 PHP_INI_END()
 /* }}} */
 
-#ifdef ZTS
-static void php_odbc_init_globals(php_odbc_globals *odbc_globals_p TSRMLS_DC)
+static PHP_GINIT_FUNCTION(odbc)
 {
-	ODBCG(num_persistent) = 0;
+	odbc_globals->num_persistent = 0;
 }
-#endif
 
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(odbc)
@@ -418,12 +417,6 @@ PHP_MINIT_FUNCTION(odbc)
 	RETCODE rc;
 #endif
 
-#ifdef ZTS
-	ts_allocate_id(&odbc_globals_id, sizeof(php_odbc_globals), php_odbc_init_globals, NULL);
-#else
-	ODBCG(num_persistent) = 0;
-#endif
-
 	REGISTER_INI_ENTRIES();
 	le_result = zend_register_list_destructors_ex(_free_odbc_result, NULL, "odbc result", module_number);
 	le_conn = zend_register_list_destructors_ex(_close_odbc_conn, NULL, "odbc link", module_number);
-- 
cgit v1.2.1