From ea72d21d93fa8e5a1a21422b14e90e6c89af3d54 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 18 Sep 2007 12:12:36 +0000 Subject: [PATCH] - fix some cc warnings on x64 --- http_encoding_api.c | 10 ++++++++-- php_http_send_api.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/http_encoding_api.c b/http_encoding_api.c index 7a6b043..c644d91 100644 --- a/http_encoding_api.c +++ b/http_encoding_api.c @@ -694,7 +694,10 @@ void _http_ob_deflatehandler(char *output, uint output_len, char **handled_outpu if (HTTP_G->send.deflate.stream) { if (output_len) { - http_encoding_deflate_stream_update((http_encoding_stream *) HTTP_G->send.deflate.stream, output, output_len, handled_output, handled_output_len); + size_t tmp_len; + + http_encoding_deflate_stream_update((http_encoding_stream *) HTTP_G->send.deflate.stream, output, output_len, handled_output, &tmp_len); + *handled_output_len = tmp_len; } if (mode & PHP_OUTPUT_HANDLER_END) { @@ -733,7 +736,10 @@ void _http_ob_inflatehandler(char *output, uint output_len, char **handled_outpu if (HTTP_G->send.inflate.stream) { if (output_len) { - http_encoding_inflate_stream_update((http_encoding_stream *) HTTP_G->send.inflate.stream, output, output_len, handled_output, handled_output_len); + size_t tmp_len; + + http_encoding_inflate_stream_update((http_encoding_stream *) HTTP_G->send.inflate.stream, output, output_len, handled_output, &tmp_len); + *handled_output_len = tmp_len; } if (mode & PHP_OUTPUT_HANDLER_END) { diff --git a/php_http_send_api.h b/php_http_send_api.h index 4b7d0ba..367afa4 100644 --- a/php_http_send_api.h +++ b/php_http_send_api.h @@ -29,7 +29,7 @@ typedef enum _http_send_mode_t { extern PHP_MINIT_FUNCTION(http_send); -#define http_send_status(s) sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) (s) TSRMLS_CC) +#define http_send_status(s) sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) (long) (s) TSRMLS_CC) #define http_send_header(n, v, r) _http_send_header_ex((n), strlen(n), (v), strlen(v), (r), NULL TSRMLS_CC) #define http_send_header_ex(n, nl, v, vl, r, s) _http_send_header_ex((n), (nl), (v), (vl), (r), (s) TSRMLS_CC) PHP_HTTP_API STATUS _http_send_header_ex(const char *name, size_t name_len, const char *value, size_t value_len, zend_bool replace, char **sent_header TSRMLS_DC); -- 2.30.2