Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:11323 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 83401 invoked by uid 1010); 18 Jul 2004 13:13:08 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 83364 invoked from network); 18 Jul 2004 13:13:07 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by pb1.pair.com with SMTP; 18 Jul 2004 13:13:07 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i6IDD7e1003729 for ; Sun, 18 Jul 2004 09:13:07 -0400 Received: from radish.cambridge.redhat.com (radish.cambridge.redhat.com [172.16.18.90]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i6IDD7a02818 for ; Sun, 18 Jul 2004 09:13:07 -0400 Received: from radish.cambridge.redhat.com (localhost.localdomain [127.0.0.1]) by radish.cambridge.redhat.com (8.12.10/8.12.7) with ESMTP id i6IDD67m016960 for ; Sun, 18 Jul 2004 14:13:06 +0100 Received: (from jorton@localhost) by radish.cambridge.redhat.com (8.12.10/8.12.10/Submit) id i6IDD6ht016959 for internals@lists.php.net; Sun, 18 Jul 2004 14:13:06 +0100 Date: Sun, 18 Jul 2004 14:13:06 +0100 To: internals@lists.php.net Message-ID: <20040718131306.GA16945@redhat.com> Mail-Followup-To: internals@lists.php.net Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.4.1i Subject: php_compat.h in ext/mbstring/oniguruma From: jorton@redhat.com (Joe Orton) I think this file needs to be renamed; the 5.0.0 build fails using mbregex and pcre with bundled pcre, for instance, since the bundled pcre picks up the wrong php_compat.h and the #define pcre_* aren't picked up. Renaming it to php_oniguruma.h and changing the #include fixes the build. Index: oniguruma.h =================================================================== RCS file: /repository/php-src/ext/mbstring/oniguruma/oniguruma.h,v retrieving revision 1.3 diff -u -r1.3 oniguruma.h --- oniguruma.h 4 Mar 2004 21:50:20 -0000 1.3 +++ oniguruma.h 18 Jul 2004 13:11:50 -0000 @@ -8,7 +8,7 @@ #ifndef ONIGURUMA_H #define ONIGURUMA_H -#include "php_compat.h" +#include "php_oniguruma.h" #define ONIGURUMA #define ONIGURUMA_VERSION_MAJOR 2 joe