Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know.

1 files changed, 6 insertions, 6 deletions

diff --git a/ext/xslt/xslt.c b/ext/xslt/xslt.c
index 9f09854298..2647406674 100644
--- a/ext/xslt/xslt.c
+++ b/ext/xslt/xslt.c
@@ -150,12 +150,12 @@ extern xslt_args *xslt_parse_arguments(char  *xml,
 	if (! strncasecmp(xml, "arg:", 4)) {
 		char *key = xml + 5;
 
-		return_value->xml.type = XSLT_IS_DATA;
+		return_value->Z_TYPE(xml) = XSLT_IS_DATA;
 		return_value->xml.ptr  = _find_xslt_argument((const char **) argv, 
 		                                             (const char *)  key);
 	}
 	else {
-		return_value->xml.type = XSLT_IS_FILE;
+		return_value->Z_TYPE(xml) = XSLT_IS_FILE;
 		return_value->xml.ptr  = estrdup(xml);
 	}
 
@@ -163,12 +163,12 @@ extern xslt_args *xslt_parse_arguments(char  *xml,
 	if (! strncasecmp(xsl, "arg:", 4)) {
 		char *key = xsl + 5;
 
-		return_value->xsl.type = XSLT_IS_DATA;
+		return_value->Z_TYPE(xsl) = XSLT_IS_DATA;
 		return_value->xsl.ptr  = _find_xslt_argument((const char **) argv, 
 		                                             (const char *)  key);
 	}
 	else {
-		return_value->xsl.type = XSLT_IS_FILE;
+		return_value->Z_TYPE(xsl) = XSLT_IS_FILE;
 		return_value->xsl.ptr  = estrdup(xsl);
 	}
 
@@ -176,12 +176,12 @@ extern xslt_args *xslt_parse_arguments(char  *xml,
 	if (! strncasecmp(result, "arg:", 4)) {
 		char *key = result + 5;
 
-		return_value->result.type = XSLT_IS_DATA;
+		return_value->Z_TYPE(result) = XSLT_IS_DATA;
 		return_value->result.ptr  = _find_xslt_argument((const char **) argv, 
 		                                                (const char *)  key);
 	}
 	else {
-		return_value->result.type = XSLT_IS_FILE;
+		return_value->Z_TYPE(result) = XSLT_IS_FILE;
 		return_value->result.ptr  = estrdup(result);
 	}