From patchwork Wed Dec 14 17:06:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 131444 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id AA4971007D3 for ; Thu, 15 Dec 2011 04:06:55 +1100 (EST) Received: (qmail 19783 invoked by alias); 14 Dec 2011 17:06:49 -0000 Received: (qmail 19763 invoked by uid 22791); 14 Dec 2011 17:06:46 -0000 X-SWARE-Spam-Status: No, hits=-2.8 required=5.0 tests=AWL, BAYES_00, NO_DNS_FOR_FROM, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mga03.intel.com (HELO mga03.intel.com) (143.182.124.21) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 14 Dec 2011 17:06:33 +0000 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 14 Dec 2011 09:06:32 -0800 X-ExtLoop1: 1 Received: from gnu-6.sc.intel.com ([10.3.194.135]) by AZSMGA002.ch.intel.com with ESMTP; 14 Dec 2011 09:06:32 -0800 Received: by gnu-6.sc.intel.com (Postfix, from userid 500) id 78F65C1EB3; Wed, 14 Dec 2011 09:06:32 -0800 (PST) Date: Wed, 14 Dec 2011 09:06:32 -0800 From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Subject: PATCH [google/gcc-4_6-branch]: Include in config/locale/generic/c_locale.h Message-ID: <20111214170632.GA6579@intel.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Hi, Revision 172595: http://gcc.gnu.org/viewcvs?view=revision&revision=172595 added NULL to config/locale/generic/c_locale.h on google/gcc-4_6-branch. But isn't included, which lead to build failure since NULL isn't defined. This patch includes . OK for google/gcc-4_6-branch? H.J. --- libstdc++-v3/ChangeLog.hjl | 3 +++ libstdc++-v3/config/locale/generic/c_locale.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) create mode 100644 libstdc++-v3/ChangeLog.hjl diff --git a/libstdc++-v3/ChangeLog.hjl b/libstdc++-v3/ChangeLog.hjl new file mode 100644 index 0000000..b9ca5bd --- /dev/null +++ b/libstdc++-v3/ChangeLog.hjl @@ -0,0 +1,3 @@ +2011-12-07 H.J. Lu + + * config/locale/generic/c_locale.h: Include . diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h index 6e6f673..58c954a 100644 --- a/libstdc++-v3/config/locale/generic/c_locale.h +++ b/libstdc++-v3/config/locale/generic/c_locale.h @@ -40,6 +40,7 @@ #pragma GCC system_header #include +#include #define _GLIBCXX_NUM_CATEGORIES 0