Revert macro-subst, because wasn't necessary here, and those who were

substitued weren't zvals

diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index f2c888ca9801317072a093c2a199a875d00a87c1..76c967b516ed619c2c57fe8f97a1f11cbe9c5678 100644 (file)
--- a/ext/curl/curl.c
+++ b/ext/curl/curl.c
@@ -577,7 +577,7 @@ PHP_FUNCTION(curl_init)
        }
 
        ch->handlers->write->method = PHP_CURL_STDOUT;
-       Z_TYPE_P(ch->handlers->write)   = PHP_CURL_ASCII;
+       ch->handlers->write->type   = PHP_CURL_ASCII;
        ch->handlers->read->method  = PHP_CURL_DIRECT;
        ch->handlers->write_header->method = PHP_CURL_IGNORE;
 
@@ -726,7 +726,7 @@ PHP_FUNCTION(curl_setopt)
                break;
        case CURLOPT_BINARYTRANSFER:
                convert_to_long_ex(zvalue);     
-               Z_TYPE_P(ch->handlers->write) = PHP_CURL_BINARY;
+               ch->handlers->write->type = PHP_CURL_BINARY;
                break;
        case CURLOPT_WRITEFUNCTION:
                zval_add_ref(zvalue);
@@ -874,7 +874,7 @@ PHP_FUNCTION(curl_exec)
        }
 
        if (ch->handlers->write->method == PHP_CURL_RETURN) {
-               if (Z_TYPE_P(ch->handlers->write) != PHP_CURL_BINARY) 
+               if (ch->handlers->write->type != PHP_CURL_BINARY) 
                        smart_str_0(&ch->handlers->write->buf);
                RETURN_STRINGL(ch->handlers->write->buf.c, ch->handlers->write->buf.len, 0);
        }

diff --git a/ext/xslt/xslt.c b/ext/xslt/xslt.c
index b3aca5a7b19b5f91d53e1a81fc2f7ac2774e3b28..9f098542980b47ae4cc7c5d0e32732b46a22d404 100644 (file)
--- 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;
 
-               Z_TYPE(return_value->xml) = XSLT_IS_DATA;
+               return_value->xml.type = XSLT_IS_DATA;
                return_value->xml.ptr  = _find_xslt_argument((const char **) argv, 
                                                             (const char *)  key);
        }
        else {
-               Z_TYPE(return_value->xml) = XSLT_IS_FILE;
+               return_value->xml.type = 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;
 
-               Z_TYPE(return_value->xsl) = XSLT_IS_DATA;
+               return_value->xsl.type = XSLT_IS_DATA;
                return_value->xsl.ptr  = _find_xslt_argument((const char **) argv, 
                                                             (const char *)  key);
        }
        else {
-               Z_TYPE(return_value->xsl) = XSLT_IS_FILE;
+               return_value->xsl.type = 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;
 
-               Z_TYPE(return_value->result) = XSLT_IS_DATA;
+               return_value->result.type = XSLT_IS_DATA;
                return_value->result.ptr  = _find_xslt_argument((const char **) argv, 
                                                                (const char *)  key);
        }
        else {
-               Z_TYPE(return_value->result) = XSLT_IS_FILE;
+               return_value->result.type = XSLT_IS_FILE;
                return_value->result.ptr  = estrdup(result);
        }