From: Daniel Beulshausen <dbeu@php.net>
Date: Sat, 9 Jun 2001 09:23:49 +0000 (+0000)
Subject: fix module initialization
X-Git-Tag: PRE_GRANULAR_GARBAGE_FIX~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ebd6f956c3f9a304d927924bc6085947183ba25;p=php

fix module initialization
---

diff --git a/ext/ingres_ii/ii.c b/ext/ingres_ii/ii.c
index c3bb203656..bddf3b5c1e 100644
--- a/ext/ingres_ii/ii.c
+++ b/ext/ingres_ii/ii.c
@@ -248,19 +248,23 @@ static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS IILS_DC)
 	return IIG(default_link);
 }
 
+static void php_ii_globals_init(zend_ii_globals *ii_globals)
+{
+	ii_globals->num_persistent = 0;
+}
+
 /* Module initialization
 */
 PHP_MINIT_FUNCTION(ii)
 {
   IIAPI_INITPARM initParm;
   
+  ZEND_INIT_MODULE_GLOBALS(ii, php_ii_globals_init, NULL);
   REGISTER_INI_ENTRIES();
   
   le_ii_link = zend_register_list_destructors_ex(php_close_ii_link, NULL, "ingres", module_number);
   le_ii_plink = zend_register_list_destructors_ex(_clean_ii_plink, _close_ii_plink, "ingres persistent", module_number);
 
-  IIG(num_persistent) = 0;
-
   /* Constants registration */
   REGISTER_LONG_CONSTANT("INGRES_ASSOC", II_ASSOC, CONST_CS | CONST_PERSISTENT);
   REGISTER_LONG_CONSTANT("INGRES_NUM", II_NUM, CONST_CS | CONST_PERSISTENT);