From: Sterling Hughes <sterling@php.net>
Date: Thu, 7 Feb 2002 22:00:21 +0000 (+0000)
Subject: move to the ZEND_DECLARE_MODULE_GLOBALS() and ZEND_EXTERN_MODULE_GLOBALS
X-Git-Tag: php-4.2.0RC1~398
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed6d751cd9a2707fa4382422dda025c8251f2999;p=php

move to the ZEND_DECLARE_MODULE_GLOBALS() and ZEND_EXTERN_MODULE_GLOBALS
macros
---

diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index 279a923b32..c6631731c7 100644
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -96,6 +96,8 @@ typedef struct _php_ps_globals {
 	zend_bool output_handler_registered;
 } php_ps_globals;
 
+typedef php_ps_globals zend_ps_globals;
+
 extern zend_module_entry session_module_entry;
 #define phpext_session_ptr &session_module_entry
 
@@ -190,12 +192,7 @@ PHPAPI void php_session_start(TSRMLS_D);
 		} 														\
 	}
 
-#ifdef ZTS
-extern int ps_globals_id;
-#else
-extern php_ps_globals ps_globals;
-#endif
-
+ZEND_EXTERN_MODULE_GLOBALS(ps);
 
 void php_session_auto_start(void *data);
 void php_session_shutdown(void *data);
diff --git a/ext/session/session.c b/ext/session/session.c
index 98790b1e21..bcfe81aa79 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -75,11 +75,7 @@ function_entry session_functions[] = {
 };
 /* }}} */
 
-#ifdef ZTS
-int ps_globals_id;
-#else
-php_ps_globals ps_globals;
-#endif
+ZEND_DECLARE_MODULE_GLOBALS(ps);
 
 static ps_module *_php_find_ps_module(char *name TSRMLS_DC);
 static const ps_serializer *_php_find_ps_serializer(char *name TSRMLS_DC);