cvs: php4 /main php.h

zeev Fri Aug 10 08:27:34 2001 EDT Modified files: /php4/main php.h Log: Let's not introduce more mess to maintain. Index: php4/main/php.h diff -u php4/main/php.h:1.149 php4/main/php.h:1.150 --- php4/main/php.h:1.149 Fri Aug 10 05:48:48 2001 +++ php4/main/php.h Fri Aug 10 08:27:33 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.149 2001/08/10 09:48:48 rasmus Exp $ */ +/* $Id: php.h,v 1.150 2001/08/10 12:27:33 zeev Exp $ */ #ifndef PHP_H #define PHP_H @@ -227,31 +227,6 @@ #define PHP_RINIT_FUNCTION(module) int PHP_RINIT(module)(INIT_FUNC_ARGS) #define PHP_RSHUTDOWN_FUNCTION(module) int PHP_RSHUTDOWN(module)(SHUTDOWN_FUNC_ARGS) #define PHP_MINFO_FUNCTION(module) void PHP_MINFO(module)(ZEND_MODULE_INFO_FUNC_ARGS) - -#define PHP_BEGIN_MODULE_GLOBALS(module_name) \ - typedef struct _php_##module_name##_globals { -#define PHP_END_MODULE_GLOBALS(module_name) \ - } php_##module_name##_globals; - -#ifdef ZTS - -#define PHP_DECLARE_MODULE_GLOBALS(module_name) \ - ts_rsrc_id module_name##_globals_id; -#define PHP_EXTERN_MODULE_GLOBALS(module_name) \ - extern ts_rsrc_id module_name##_globals_id; -#define PHP_INIT_MODULE_GLOBALS(module_name, globals_ctor, globals_dtor) \ - ts_allocate_id(&module_name##_globals_id, sizeof(php_##module_name##_globals), (ts_allocate_ctor) globals_ctor, (ts_allocate_dtor) globals_dtor); - -#else - -#define PHP_DECLARE_MODULE_GLOBALS(module_name) \ - php_##module_name##_globals module_name##_globals; -#define PHP_EXTERN_MODULE_GLOBALS(module_name) \ - extern php_##module_name##_globals module_name##_globals; -#define PHP_INIT_MODULE_GLOBALS(module_name, globals_ctor, globals_dtor) \ - globals_ctor(&module_name##_globals); - -#endif /* global variables */ extern pval *data;