From 78b54eaa8b35285a898dd0b37495125ba764972c Mon Sep 17 00:00:00 2001 From: Hartmut Holzgraefe Date: Tue, 1 May 2001 16:21:58 +0000 Subject: [PATCH] hartmfixed and extended the ini parameter and module globals stuff once again: someone test this please! --- ext/skeleton/php_skeleton.h | 15 ++++++++------- ext/skeleton/skeleton.c | 2 ++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ext/skeleton/php_skeleton.h b/ext/skeleton/php_skeleton.h index 9f052040fb..69b09e0604 100644 --- a/ext/skeleton/php_skeleton.h +++ b/ext/skeleton/php_skeleton.h @@ -26,23 +26,24 @@ PHP_FUNCTION(confirm_extname_compiled); /* For testing, remove later. */ and END macros here: ZEND_BEGIN_MODULE_GLOBALS(extname) - int global_variable; + int global_value; + char *global_string; ZEND_END_MODULE_GLOBALS(extname) */ /* In every function that needs to use variables in php_extname_globals, - do call EXTNAMELS_FETCH(); after declaring other variables used by - that function, and always refer to them as EXTNAMEG(variable). + do call EXTNAME_LS_FETCH(); after declaring other variables used by + that function, and always refer to them as EXTNAME_G(variable). You are encouraged to rename these macros something shorter, see examples in any other php module directory. */ #ifdef ZTS -#define EXTNAMEG(v) (extname_globals->v) -#define EXTNAMELS_FETCH() php_extname_globals *extname_globals = ts_resource(extname_globals_id) +#define EXTNAME_G(v) (extname_globals->v) +#define EXTNAME_LS_FETCH() zend_extname_globals *extname_globals = ts_resource(extname_globals_id) #else -#define EXTNAMEG(v) (extname_globals.v) -#define EXTNAMELS_FETCH() +#define EXTNAME_G(v) (extname_globals.v) +#define EXTNAME_LS_FETCH() #endif #endif /* PHP_EXTNAME_H */ diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c index 07fba18518..77ac164654 100644 --- a/ext/skeleton/skeleton.c +++ b/ext/skeleton/skeleton.c @@ -36,6 +36,8 @@ ZEND_GET_MODULE(extname) /* Remove comments and fill if you need to have entries in php.ini PHP_INI_BEGIN() + STD_PHP_INI_ENTRY("extname.value", "42", PHP_INI_ALL, OnUpdateInt, global_value, zend_extname_globals, extname_globals) + STD_PHP_INI_ENTRY("extname.string", "foobar", PHP_INI_ALL, OnUpdateString, global_string, zend_extname_globals, extname_globals) PHP_INI_END() */ -- 2.50.1