From: Michael Wallner <mike@php.net>
Date: Sun, 18 Dec 2005 15:37:03 +0000 (+0000)
Subject: thanks, msvc didn't complain about that
X-Git-Tag: RELEASE_0_21_0~62
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=4ee364803f03b507ff6047dc2b6be235a5c0a16b;p=m6w6%2Fext-http

thanks, msvc didn't complain about that
---

diff --git a/http_send_api.c b/http_send_api.c
index 87b3c94..c376b05 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -79,7 +79,7 @@ static inline void _http_send_response_start(void **buffer, size_t content_lengt
 		http_encoding_stream *s = emalloc(sizeof(http_encoding_stream));
 		
 		http_encoding_stream_init(s, gzip?HTTP_ENCODING_STREAM_GZIP_HEADER:0, -1, &encoded, &encoded_len);
-		phpstr_chunked_output(PHPSTR_P(s->storage), encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC);
+		phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC);
 		STR_FREE(encoded);
 		*buffer = s;
 #endif
@@ -98,7 +98,7 @@ static inline void _http_send_response_data_plain(void **buffer, const char *dat
 		http_encoding_stream *s = *((http_encoding_stream **) buffer);
 		
 		http_encoding_stream_update(s, data, data_len, &encoded, &encoded_len);
-		phpstr_chunked_output(PHPSTR_P(s->storage), encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC);
+		phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC);
 		efree(encoded);
 #else
 		http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug");
@@ -169,7 +169,7 @@ static inline void _http_send_response_finish(void **buffer TSRMLS_DC)
 		http_encoding_stream *s = *((http_encoding_stream **) buffer);
 		
 		http_encoding_stream_finish(s, &encoded, &encoded_len);
-		phpstr_chunked_output(PHPSTR_P(s->storage), encoded, encoded_len, 0, _http_flush TSRMLS_CC);
+		phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, 0, _http_flush TSRMLS_CC);
 		STR_FREE(encoded);
 		efree(s);
 #else
diff --git a/phpstr/phpstr.h b/phpstr/phpstr.h
index a3a1596..9e18e54 100644
--- a/phpstr/phpstr.h
+++ b/phpstr/phpstr.h
@@ -31,7 +31,6 @@
 #endif
 
 #define PHPSTR(p) ((phpstr *) (p))
-#define PHPSTR_P(p) ((phpstr **) (&p))
 #define PHPSTR_VAL(p) (PHPSTR(p))->data
 #define PHPSTR_LEN(p) (PHPSTR(p))->used