diff options
author | Sascha Schumann <sas@php.net> | 2000-12-10 23:22:20 +0000 |
---|---|---|
committer | Sascha Schumann <sas@php.net> | 2000-12-10 23:22:20 +0000 |
commit | 107aa9f71a562a39c31939c6283db409ec041df1 (patch) | |
tree | c0adf9f5a679e33164915f585a184140b55a463c /sapi/apache/mod_php4.h | |
parent | d41137fedfca157ce76f339c28359019ca030322 (diff) | |
download | php-git-107aa9f71a562a39c31939c6283db409ec041df1.tar.gz |
Align ZTS handling of globals with common usage
Diffstat (limited to 'sapi/apache/mod_php4.h')
-rw-r--r-- | sapi/apache/mod_php4.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sapi/apache/mod_php4.h b/sapi/apache/mod_php4.h index 3b2813dad4..461805550c 100644 --- a/sapi/apache/mod_php4.h +++ b/sapi/apache/mod_php4.h @@ -33,7 +33,19 @@ typedef struct { } php_apache_info_struct; extern zend_module_entry apache_module_entry; + +#ifdef ZTS +extern int php_apache_info_id; +#define APLS_D php_apache_info_struct *apache_globals +#define AP(v) (apache_globals->v) +#define APLS_FETCH() APLS_D = ts_resource(php_apache_info_id) +#else extern php_apache_info_struct php_apache_info; +#define APLS_D +#define AP(v) (php_apache_info.v) +#define APLS_FETCH() +#endif + #ifdef WIN32 #define S_IXUSR _S_IEXEC |