diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/soap/php_soap.h | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/soap/php_soap.h')
| -rw-r--r-- | ext/soap/php_soap.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h index f32555cd93..f998587994 100644 --- a/ext/soap/php_soap.h +++ b/ext/soap/php_soap.h @@ -193,14 +193,17 @@ extern zend_module_entry soap_module_entry; ZEND_EXTERN_MODULE_GLOBALS(soap) #ifdef ZTS -# define SOAP_GLOBAL(v) TSRMG(soap_globals_id, zend_soap_globals *, v) +# 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) #endif extern zend_class_entry* soap_var_class_entry; -void add_soap_fault(zval *obj, char *fault_code, char *fault_string, char *fault_actor, zval *fault_detail TSRMLS_DC); +void add_soap_fault(zval *obj, char *fault_code, char *fault_string, char *fault_actor, zval *fault_detail); #define soap_error0(severity, format) \ php_error(severity, "SOAP-ERROR: " format) |