From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18842 invoked by alias); 21 Nov 2014 12:49:07 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 18830 invoked by uid 89); 21 Nov 2014 12:49:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 21 Nov 2014 12:49:05 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sALCn0Xo029442 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 21 Nov 2014 07:49:01 -0500 Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sALCmwHG026221; Fri, 21 Nov 2014 07:48:59 -0500 Message-ID: <546F34BA.20809@redhat.com> Date: Fri, 21 Nov 2014 12:49:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.1.1 MIME-Version: 1.0 To: Yao Qi , gdb-patches@sourceware.org Subject: Re: [PATCH 6/7] Include wchar.h and wctype.h unconditionally References: <1416057612-16155-1-git-send-email-yao@codesourcery.com> <1416057612-16155-7-git-send-email-yao@codesourcery.com> In-Reply-To: <1416057612-16155-7-git-send-email-yao@codesourcery.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SW-Source: 2014-11/txt/msg00512.txt.bz2 On 11/15/2014 01:20 PM, Yao Qi wrote: > As gnulib modules wchar and wctype is imported, we can include wchar.h > and wctype.h unconditionally. This patch is also to remove HAVE_WCHAR_H > check. > > gdb: > > 2014-11-15 Yao Qi > > * gdb_wchar.h: Include wchar.h and wctype.h. > [HAVE_ICONV && HAVE_BTOWC]: Don't check HAVE_WCHAR_T and don't > include wchar.h and wctype.h. > Don't check HAVE_WCHAR_H. > --- > gdb/gdb_wchar.h | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/gdb/gdb_wchar.h b/gdb/gdb_wchar.h > index f88673b..c7a0f1e 100644 > --- a/gdb/gdb_wchar.h > +++ b/gdb/gdb_wchar.h > @@ -49,18 +49,18 @@ > #define PHONY_ICONV > #endif > > +#include > +#include > + > /* We use "btowc" as a sentinel to detect functioning wchar_t support. > We check for either __STDC_ISO_10646__ or a new-enough libiconv in > order to ensure we can convert to and from wchar_t. We choose > libiconv version 0x108 because it is the first version with > iconvlist. */ > -#if defined (HAVE_ICONV) && defined (HAVE_WCHAR_H) && defined (HAVE_BTOWC) \ > +#if defined (HAVE_ICONV) && defined (HAVE_BTOWC) \ > && (defined (__STDC_ISO_10646__) \ > || (defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108)) > > -#include > -#include > - > typedef wchar_t gdb_wchar_t; > typedef wint_t gdb_wint_t; > > @@ -94,7 +94,7 @@ const char *intermediate_encoding (void); > > /* If we got here and have wchar_t support, we might be on a system > with some problem. So, we just disable everything. */ > -#if defined (HAVE_WCHAR_H) && defined (HAVE_BTOWC) > +#if defined (HAVE_BTOWC) > #define PHONY_ICONV > #endif It's hard to reason about all the modes supported here, but I think this is OK. Seems like the comment above about wchar_t support should be updated though. (I wonder whether if we pulled in the gnulib btowc module, we could get rid of at least some of this fallback stuff. We're already pulling in mbrtowc...) Thanks, Pedro Alves