moriyoshi Wed Jun 4 10:29:53 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/iconv iconv.c
Log:
MFH(r-1.87): fixed ob_iconv_handler() type mismatch issue on 64bit platforms.
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.65.2.4 php4/ext/iconv/iconv.c:1.65.2.5
--- php4/ext/iconv/iconv.c:1.65.2.4 Tue Mar 4 12:20:27 2003
+++ php4/ext/iconv/iconv.c Wed Jun 4 10:29:53 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.65.2.4 2003/03/04 17:20:27 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.65.2.5 2003/06/04 14:29:53 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -193,11 +193,10 @@
const char *in_charset, const
char *out_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;
@@ -209,7 +208,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;
@@ -427,7 +426,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
