cvs: php4 /ext/session php_session.h session.c

sterling Thu Feb 7 17:00:21 2002 EDT Modified files: /php4/ext/session php_session.h session.c Log: move to the ZEND_DECLARE_MODULE_GLOBALS() and ZEND_EXTERN_MODULE_GLOBALS macros Index: php4/ext/session/php_session.h diff -u php4/ext/session/php_session.h:1.68 php4/ext/session/php_session.h:1.69 --- php4/ext/session/php_session.h:1.68 Mon Feb 4 20:28:55 2002 +++ php4/ext/session/php_session.h Thu Feb 7 17:00:21 2002 @@ -96,6 +96,8 @@ 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 @@ } \ } -#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); Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.275 php4/ext/session/session.c:1.276 --- php4/ext/session/session.c:1.275 Mon Feb 4 20:30:22 2002 +++ php4/ext/session/session.c Thu Feb 7 17:00:21 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.275 2002/02/05 01:30:22 sniper Exp $ */ +/* $Id: session.c,v 1.276 2002/02/07 22:00:21 sterling Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -75,11 +75,7 @@ }; /* }}} */ -#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);