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, 3 insertions, 3 deletions

diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index 76c967b516..21ec7e5cc3 100644
--- 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;
-	ch->handlers->write->type   = PHP_CURL_ASCII;
+	ch->handlers->Z_TYPE_P(write)   = 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);	
-		ch->handlers->write->type = PHP_CURL_BINARY;
+		ch->handlers->Z_TYPE_P(write) = 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 (ch->handlers->write->type != PHP_CURL_BINARY) 
+		if (ch->handlers->Z_TYPE_P(write) != PHP_CURL_BINARY) 
 			smart_str_0(&ch->handlers->write->buf);
 		RETURN_STRINGL(ch->handlers->write->buf.c, ch->handlers->write->buf.len, 0);
 	}