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_encoding.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_encoding.h')
-rw-r--r-- | ext/soap/php_encoding.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/soap/php_encoding.h b/ext/soap/php_encoding.h index 4424116524..a8cc71a6f1 100644 --- a/ext/soap/php_encoding.h +++ b/ext/soap/php_encoding.h @@ -183,23 +183,23 @@ struct _encodeType { struct _encode { encodeType details; - zval *(*to_zval)(zval *ret, encodeTypePtr type, xmlNodePtr data TSRMLS_DC); - xmlNodePtr (*to_xml)(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC); + zval *(*to_zval)(zval *ret, encodeTypePtr type, xmlNodePtr data); + xmlNodePtr (*to_xml)(encodeTypePtr type, zval *data, int style, xmlNodePtr parent); }; /* Master functions all encode/decode should be called thur these functions */ -xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr parent TSRMLS_DC); -zval *master_to_zval(zval *ret, encodePtr encode, xmlNodePtr data TSRMLS_DC); +xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr parent); +zval *master_to_zval(zval *ret, encodePtr encode, xmlNodePtr data); /* user defined mapping */ -xmlNodePtr to_xml_user(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC); -zval *to_zval_user(zval *ret, encodeTypePtr type, xmlNodePtr node TSRMLS_DC); +xmlNodePtr to_xml_user(encodeTypePtr type, zval *data, int style, xmlNodePtr parent); +zval *to_zval_user(zval *ret, encodeTypePtr type, xmlNodePtr node); void whiteSpace_replace(xmlChar* str); void whiteSpace_collapse(xmlChar* str); -xmlNodePtr sdl_guess_convert_xml(encodeTypePtr enc, zval* data, int style, xmlNodePtr parent TSRMLS_DC); -zval *sdl_guess_convert_zval(zval *ret, encodeTypePtr enc, xmlNodePtr data TSRMLS_DC); +xmlNodePtr sdl_guess_convert_xml(encodeTypePtr enc, zval* data, int style, xmlNodePtr parent); +zval *sdl_guess_convert_zval(zval *ret, encodeTypePtr enc, xmlNodePtr data); void encode_finish(); void encode_reset_ns(); |