ext/soap support for phpng (incomplete - just compilable)

1 files changed, 6 insertions, 6 deletions

diff --git a/ext/soap/php_encoding.h b/ext/soap/php_encoding.h
index 5a8186ff74..adcccd3612 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)(encodeTypePtr type, xmlNodePtr data TSRMLS_DC);
+	zval *(*to_zval)(zval *ret, encodeTypePtr type, xmlNodePtr data TSRMLS_DC);
 	xmlNodePtr (*to_xml)(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC);
 };
 
 /* 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(encodePtr encode, xmlNodePtr data TSRMLS_DC);
+zval *master_to_zval(zval *ret, encodePtr encode, xmlNodePtr data TSRMLS_DC);
 
 /* user defined mapping */
 xmlNodePtr to_xml_user(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC);
-zval *to_zval_user(encodeTypePtr type, xmlNodePtr node TSRMLS_DC);
+zval *to_zval_user(zval *ret, encodeTypePtr type, xmlNodePtr node TSRMLS_DC);
 
 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(encodeTypePtr enc, xmlNodePtr data TSRMLS_DC);
+zval *sdl_guess_convert_zval(zval *ret, encodeTypePtr enc, xmlNodePtr data TSRMLS_DC);
 
 void encode_finish();
 void encode_reset_ns();
@@ -207,8 +207,8 @@ xmlNsPtr encode_add_ns(xmlNodePtr node, const char* ns);
 
 encodePtr get_conversion(int encode);
 
-void delete_encoder(void *handle);
-void delete_encoder_persistent(void *handle);
+void delete_encoder(zval *zv);
+void delete_encoder_persistent(zval *zv);
 
 extern encode defaultEncoding[];
 extern int numDefaultEncodings;