cvs: php4 /ext/zlib zlib.c
| From: | Marcus B�rger | Date: | Sat, 10 Aug 2002 10:41:00 +0000 |
| Subject: | cvs: php4 /ext/zlib zlib.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13243@lists.php.net to get a copy of this message | ||
helly Sat Aug 10 06:41:00 2002 EDT
Modified files:
/php4/ext/zlib zlib.c
Log:
should fix all windows warnings
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.138 php4/ext/zlib/zlib.c:1.139
--- php4/ext/zlib/zlib.c:1.138 Fri Aug 9 18:29:58 2002
+++ php4/ext/zlib/zlib.c Sat Aug 10 06:40:59 2002
@@ -18,7 +18,7 @@
| Jade Nicoletti <nicoletti@nns.ch> |
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.138 2002/08/09 22:29:58 helly Exp $ */
+/* $Id: zlib.c,v 1.139 2002/08/10 10:40:59 helly Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -679,7 +679,7 @@
int start_offset = (do_start?10:0);
int end_offset = (do_end?8:0);
- outlen = sizeof(char) * (str_length * 1.001 + 12) + 1; /* leave some room for a trailing \0 */
+ outlen = (uint)(sizeof(char) * (str_length * 1.001f + 12) + 1); /* leave some room for a trailing
\0 */
if ((outlen+start_offset+end_offset) > *p_buffer_len) {
buffer = (Bytef *) emalloc(outlen+start_offset+end_offset);
} else {
@@ -1014,7 +1014,7 @@
}
php_start_ob_buffer(NULL, buffer_size, 0 TSRMLS_CC);
- php_ob_set_internal_handler(php_gzip_output_handler, buffer_size*1.5, "zlib output
compression", 0 TSRMLS_CC);
+ php_ob_set_internal_handler(php_gzip_output_handler, (uint)(buffer_size*1.5f), "zlib output
compression", 0 TSRMLS_CC);
if (ZLIBG(output_handler) && strlen(ZLIBG(output_handler))) {
php_start_ob_buffer_named(ZLIBG(output_handler), 0, 1 TSRMLS_CC);
}