cvs: php4 /ext/curl curl.c /ext/xslt xslt.c

jeroen Wed Sep 26 18:24:43 2001 EDT Modified files: /php4/ext/curl curl.c /php4/ext/xslt xslt.c Log: Revert macro-subst, because wasn't necessary here, and those who were substitued weren't zvals Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.90 php4/ext/curl/curl.c:1.91 --- php4/ext/curl/curl.c:1.90 Wed Sep 26 04:35:40 2001 +++ php4/ext/curl/curl.c Wed Sep 26 18:24:42 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.90 2001/09/26 08:35:40 jeroen Exp $ */ +/* $Id: curl.c,v 1.91 2001/09/26 22:24:42 jeroen Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -577,7 +577,7 @@ } 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 @@ 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 @@ } 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); } Index: php4/ext/xslt/xslt.c diff -u php4/ext/xslt/xslt.c:1.18 php4/ext/xslt/xslt.c:1.19 --- php4/ext/xslt/xslt.c:1.18 Wed Sep 26 04:35:45 2001 +++ php4/ext/xslt/xslt.c Wed Sep 26 18:24:42 2001 @@ -150,12 +150,12 @@ 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 @@ 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 @@ 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); }