moriyoshi Wed Jun 4 10:29:43 2003 EDT
Modified files:
/php4/ext/iconv iconv.c
Log:
Fixed ob_iconv_handler() type mismatch issue on 64bit platforms.
Patch by Joe Orton <[EMAIL PROTECTED]>
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.86 php4/ext/iconv/iconv.c:1.87
--- php4/ext/iconv/iconv.c:1.86 Tue Mar 18 07:06:00 2003
+++ php4/ext/iconv/iconv.c Wed Jun 4 10:29:43 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.86 2003/03/18 12:06:00 ssb Exp $ */
+/* $Id: iconv.c,v 1.87 2003/06/04 14:29:43 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -327,11 +327,10 @@
const char *out_charset, const
char *in_charset)
{
#if !ICONV_SUPPORTS_ERRNO
- unsigned int in_size, out_size, out_left;
+ size_t in_size, out_size, out_left;
char *out_buffer, *out_p;
iconv_t cd;
size_t result;
- typedef unsigned int ucs4_t;
*out = NULL;
*out_len = 0;
@@ -343,7 +342,7 @@
a single char can be more than 4 bytes.
I added 15 extra bytes for safety. <[EMAIL PROTECTED]>
*/
- out_size = in_len * sizeof(ucs4_t) + 15;
+ out_size = in_len * sizeof(int) + 15;
out_left = out_size;
in_size = in_len;
@@ -1730,7 +1729,7 @@
{
char *out_buffer, *content_type, *mimetype = NULL, *s;
zval *zv_string;
- unsigned int out_len;
+ size_t out_len;
int mimetype_alloced = 0;
long status;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
