diff options
Diffstat (limited to 'ext/soap/php_soap.h')
| -rw-r--r-- | ext/soap/php_soap.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h index ea3b54ce4d..5736f1043a 100644 --- a/ext/soap/php_soap.h +++ b/ext/soap/php_soap.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -189,14 +189,10 @@ extern zend_module_entry soap_module_entry; #define phpext_soap_ptr soap_module_ptr ZEND_EXTERN_MODULE_GLOBALS(soap) +#define SOAP_GLOBAL(v) ZEND_MODULE_GLOBALS_ACCESSOR(soap, v) -#ifdef ZTS -# define SOAP_GLOBAL(v) ZEND_TSRMG(soap_globals_id, zend_soap_globals *, v) -# ifdef COMPILE_DL_SOAP -ZEND_TSRMLS_CACHE_EXTERN(); -# endif -#else -# define SOAP_GLOBAL(v) (soap_globals.v) +#if defined(ZTS) && defined(COMPILE_DL_SOAP) +ZEND_TSRMLS_CACHE_EXTERN() #endif extern zend_class_entry* soap_var_class_entry; |