Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:12800 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 31064 invoked by uid 1010); 14 Sep 2004 15:38:26 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 19164 invoked from network); 14 Sep 2004 15:36:24 -0000 Received: from unknown (HELO gw2.emini.dk) (192.38.9.232) by pb1.pair.com with SMTP; 14 Sep 2004 15:36:24 -0000 Received: from lamp (client-117-p-1-lns.glfd.dial.virgin.net [81.103.144.116]) by gw2.emini.dk (Postfix) with ESMTP id AB729231E3 for ; Tue, 14 Sep 2004 17:36:22 +0200 (CEST) Reply-To: To: "internals" Date: Tue, 14 Sep 2004 16:51:36 +0100 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0000_01C49A7B.194629A0" X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2910.0) Importance: Normal X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106 Subject: [PATCH] round 3 From: steph@zend.com ("Steph") ------=_NextPart_000_0000_01C49A7B.194629A0 Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: 7bit Moved #if a few paces to the left on Wez's advice. Fussy old compilers ;) Still does the same job (fixes win32 build and all builds where there is no strcoll), only this time without breaking otherwise happy builds. - Steph ------=_NextPart_000_0000_01C49A7B.194629A0 Content-Type: text/plain; name="round3.txt" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="round3.txt" Index: Zend/zend_config.w32.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /repository/ZendEngine2/zend_config.w32.h,v retrieving revision 1.36 diff -u -r1.36 zend_config.w32.h --- Zend/zend_config.w32.h 8 Jan 2004 17:31:47 -0000 1.36 +++ Zend/zend_config.w32.h 14 Sep 2004 15:24:36 -0000 @@ -30,6 +30,8 @@ #include #include =20 +#define HAVE_STRCOLL 1 + #include =20 #ifndef ZEND_INCLUDE_FULL_WINDOWS_HEADERS Index: Zend/zend_operators.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /repository/ZendEngine2/zend_operators.c,v retrieving revision 1.196 diff -u -r1.196 zend_operators.c --- Zend/zend_operators.c 11 Sep 2004 14:22:35 -0000 1.196 +++ Zend/zend_operators.c 14 Sep 2004 15:24:41 -0000 @@ -1222,7 +1222,6 @@ return SUCCESS; } =20 -#if HAVE_STRCOLL ZEND_API int string_locale_compare_function(zval *result, zval *op1, = zval *op2 TSRMLS_DC) { zval op1_copy, op2_copy; @@ -1249,7 +1248,6 @@ } return SUCCESS; } -#endif =20 ZEND_API int numeric_compare_function(zval *result, zval *op1, zval = *op2 TSRMLS_DC) { Index: ext/standard/array.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /repository/php-src/ext/standard/array.c,v retrieving revision 1.274 diff -u -r1.274 array.c --- ext/standard/array.c 11 Sep 2004 14:22:35 -0000 1.274 +++ ext/standard/array.c 14 Sep 2004 15:25:10 -0000 @@ -55,17 +55,19 @@ #define EXTR_OVERWRITE 0 #define EXTR_SKIP 1 #define EXTR_PREFIX_SAME 2 -#define EXTR_PREFIX_ALL 3 -#define EXTR_PREFIX_INVALID 4 -#define EXTR_PREFIX_IF_EXISTS 5 -#define EXTR_IF_EXISTS 6 +#define EXTR_PREFIX_ALL 3 +#define EXTR_PREFIX_INVALID 4 +#define EXTR_PREFIX_IF_EXISTS 5 +#define EXTR_IF_EXISTS 6 =20 #define EXTR_REFS 0x100 =20 #define SORT_REGULAR 0 #define SORT_NUMERIC 1 -#define SORT_STRING 2 -#define SORT_LOCALE_STRING 5 +#define SORT_STRING 2 +#if HAVE_STRCOLL +#define SORT_LOCALE_STRING 5 +#endif =20 #define SORT_DESC 3 #define SORT_ASC 4 @@ -115,7 +117,10 @@ REGISTER_LONG_CONSTANT("SORT_REGULAR", SORT_REGULAR, CONST_CS | = CONST_PERSISTENT); REGISTER_LONG_CONSTANT("SORT_NUMERIC", SORT_NUMERIC, CONST_CS | = CONST_PERSISTENT); REGISTER_LONG_CONSTANT("SORT_STRING", SORT_STRING, CONST_CS | = CONST_PERSISTENT); + +#if HAVE_STRCOLL REGISTER_LONG_CONSTANT("SORT_LOCALE_STRING", SORT_LOCALE_STRING, = CONST_CS | CONST_PERSISTENT); +#endif =20 REGISTER_LONG_CONSTANT("CASE_LOWER", CASE_LOWER, CONST_CS | = CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CASE_UPPER", CASE_UPPER, CONST_CS | = CONST_PERSISTENT); ------=_NextPart_000_0000_01C49A7B.194629A0--