Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:5648 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 60559 invoked by uid 1010); 21 Nov 2003 19:49:14 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 60535 invoked from network); 21 Nov 2003 19:49:14 -0000 Received: from unknown (HELO hermes.sunderland.ac.uk) (157.228.37.117) by pb1.pair.com with SMTP; 21 Nov 2003 19:49:14 -0000 Received: from steph2 ([157.228.147.166]) by hermes.sunderland.ac.uk (iPlanet Messaging Server 5.2 Patch 1 (built Aug 19 2002)) with ESMTPA id <0HOP00KQUWHOCN@hermes.sunderland.ac.uk> for internals@lists.php.net; Fri, 21 Nov 2003 19:51:26 +0000 (GMT) Date: Fri, 21 Nov 2003 19:57:26 +0000 To: internals Reply-to: steph.fox@virgin.net Message-ID: MIME-version: 1.0 X-MIMEOLE: Produced By Microsoft MimeOLE V6.00.2800.1106 X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2910.0) Content-type: multipart/mixed; boundary="Boundary_(ID_69bI2ecfT6qMC1Uq6QiKUg)" Importance: Normal X-Priority: 3 (Normal) X-MSMail-priority: Normal Subject: [PATCH] fixes #26194 From: steph.fox@virgin.net (Steph) --Boundary_(ID_69bI2ecfT6qMC1Uq6QiKUg) Content-type: text/plain; charset=Windows-1252 Content-transfer-encoding: 7BIT Works on my box (no idea how sane this is, or what it may break on other systems, please handle like barbed wire). - Steph --Boundary_(ID_69bI2ecfT6qMC1Uq6QiKUg) Content-type: text/plain; name=iconv.txt Content-transfer-encoding: 7BIT Content-disposition: attachment; filename=iconv.txt ? ext/libxml/php_libxml2.def Index: ext/iconv/iconv.c =================================================================== RCS file: /repository/php-src/ext/iconv/iconv.c,v retrieving revision 1.97 diff -u -r1.97 iconv.c --- ext/iconv/iconv.c 2 Nov 2003 18:54:08 -0000 1.97 +++ ext/iconv/iconv.c 21 Nov 2003 19:32:05 -0000 @@ -58,10 +58,11 @@ #define _php_iconv_memequal(a, b, c) \ ((c) == sizeof(unsigned long) ? *((unsigned long *)(a)) == *((unsigned long *)(b)) : ((c) == sizeof(unsigned int) ? *((unsigned int *)(a)) == *((unsigned int *)(b)) : memcmp(a, b, c) == 0)) + /* {{{ iconv_functions[] */ function_entry iconv_functions[] = { - PHP_NAMED_FE(iconv,php_if_iconv, NULL) + { "iconv", php_if_iconv, NULL }, PHP_FE(ob_iconv_handler, NULL) PHP_FE(iconv_get_encoding, NULL) PHP_FE(iconv_set_encoding, NULL) --Boundary_(ID_69bI2ecfT6qMC1Uq6QiKUg)--