Fixed build

diff --git a/http_send_api.c b/http_send_api.c
index 6403cf26fe97708e33b7d50d5d2dbb8b51036464..87b3c9444e8287878614e8c97eba827e9d534d73 100644 (file)
--- 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);
                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(s->storage), encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC);
+               phpstr_chunked_output(PHPSTR_P(s->storage), encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC);

                STR_FREE(encoded);
                *buffer = s;
 #endif
                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);
                http_encoding_stream *s = *((http_encoding_stream **) buffer);
                
                http_encoding_stream_update(s, data, data_len, &encoded, &encoded_len);

-               phpstr_chunked_output(&PHPSTR(s->storage), encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC);
+               phpstr_chunked_output(PHPSTR_P(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");
                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);
                http_encoding_stream *s = *((http_encoding_stream **) buffer);
                
                http_encoding_stream_finish(s, &encoded, &encoded_len);

-               phpstr_chunked_output(&PHPSTR(s->storage), encoded, encoded_len, 0, _http_flush TSRMLS_CC);
+               phpstr_chunked_output(PHPSTR_P(s->storage), encoded, encoded_len, 0, _http_flush TSRMLS_CC);

                STR_FREE(encoded);
                efree(s);
 #else
                STR_FREE(encoded);
                efree(s);
 #else

diff --git a/phpstr/phpstr.h b/phpstr/phpstr.h
index 9e18e5464df99d55ede2ecc471a7d359c5b0ef0c..a3a15962660da8a7ad552d94c4c12c491ec426ae 100644 (file)
--- a/phpstr/phpstr.h
+++ b/phpstr/phpstr.h
@@ -31,6 +31,7 @@
 #endif
 
 #define PHPSTR(p) ((phpstr *) (p))
 #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
 
 #define PHPSTR_VAL(p) (PHPSTR(p))->data
 #define PHPSTR_LEN(p) (PHPSTR(p))->used