diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
| commit | b68da91d52801fb2cc4d2a4a44c859ea5b6c622b (patch) | |
| tree | 290f7c8ea7fd2df02c995b07c1d490c2de333db5 /ext/soap/php_encoding.h | |
| parent | 4f6539bdaf62f0343f4ec67638d2f96e8c1c00ae (diff) | |
| parent | a9e86957c70c181e830ba05bb030c468d0cb15e1 (diff) | |
| download | php-git-b68da91d52801fb2cc4d2a4a44c859ea5b6c622b.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
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(); |