From patchwork Sun Mar 17 19:04:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Zaretskii X-Patchwork-Id: 228310 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 3F5532C008D for ; Mon, 18 Mar 2013 06:05:04 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1364151906; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Date:From:Subject:In-reply-to:To:Cc:Reply-to:Message-id: References:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=FJcvOOs cwd+8mkvLx5sbexGrX2c=; b=noqePxOQTpyJU+yGaJu0cyR5ru15TOK/Q3/irnh R4vILSCNfrNUUWeLUOVHq1ShTkgmp0ngRVAlBZ9yAN18ppnAntiea7BOUETGmG3Y FbyFm2/KFF/MM/2VMcz6H4Oe7hyNBNu7OWqD6lw3zj2Ejn5daHBvcyp6xpEeqvc4 oh6w= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Date:From:Subject:In-reply-to:To:Cc:Reply-to:Message-id:References:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=VXXDVHciRbUb9C3pdarb/nWpLuV9zO5H04lpdhm4myrtzJbA8DPQ42J9+Zqesd yEE1iGu83dx3mJzD5fsXAVrT4Pv+xkbSDh4ZZ/4ZzwPbBJocrxQirgMMge36Y+9j KwBGr+N5EDk1QRf6QhsOvmwy0O79FG5ncwDEzxSH19mxc=; Received: (qmail 26943 invoked by alias); 17 Mar 2013 19:04:48 -0000 Received: (qmail 26922 invoked by uid 22791); 17 Mar 2013 19:04:46 -0000 X-SWARE-Spam-Status: No, hits=-4.5 required=5.0 tests=AWL, BAYES_00, KHOP_THREADED, RCVD_IN_DNSWL_NONE, RCVD_IN_HOSTKARMA_NO, RCVD_IN_HOSTKARMA_YE, SPF_SOFTFAIL X-Spam-Check-By: sourceware.org Received: from mtaout21.012.net.il (HELO mtaout21.012.net.il) (80.179.55.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 17 Mar 2013 19:04:38 +0000 Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0MJT00I00JGP6J00@a-mtaout21.012.net.il> for gcc-patches@gcc.gnu.org; Sun, 17 Mar 2013 21:04:36 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MJT00H8VJNNSH90@a-mtaout21.012.net.il>; Sun, 17 Mar 2013 21:04:36 +0200 (IST) Date: Sun, 17 Mar 2013 21:04:41 +0200 From: Eli Zaretskii Subject: Re: Fix a MinGW warning in libiberty/setenv.c In-reply-to: To: Ian Lance Taylor Cc: gdb-patches@sourceware.org, dj@redhat.com, gcc-patches@gcc.gnu.org Reply-to: Eli Zaretskii Message-id: <834ng93l12.fsf@gnu.org> References: <83txofi24i.fsf@gnu.org> 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 > Date: Wed, 13 Mar 2013 11:52:48 -0700 > From: Ian Lance Taylor > Cc: gdb-patches@sourceware.org, dj@redhat.com, gcc-patches@gcc.gnu.org > > On 3/13/13, Eli Zaretskii wrote: > > > > #ifdef __MSVCRT__ > > extern _CRTIMP char *** __cdecl __MINGW_NOTHROW __p__environ(void); > > extern _CRTIMP wchar_t *** __cdecl __MINGW_NOTHROW > > __p__wenviron(void); > > # define _environ (*__p__environ()) > > # define _wenviron (*__p__wenviron()) > > #else /* ! __MSVCRT__ */ > > #endif /* ! __MSVCRT__ */ > > > > #define environ _environ > > Cool. > > > and setenv.c does this: > > > > #ifndef HAVE_ENVIRON_DECL > > extern char **environ; > > #endif > > > > Solution: Add a guard: > > This is OK with a ChangeLog entry. Thanks, committed thusly: 2013-03-17 Eli Zaretskii * setenv.c [!HAVE_ENVIRON_DECL]: Avoid declaring environ if it is a macro, as this causes compiler warnings with MinGW. Index: libiberty/setenv.c =================================================================== RCS file: /cvs/src/src/libiberty/setenv.c,v retrieving revision 1.10 diff -u -r1.10 setenv.c --- libiberty/setenv.c 3 Feb 2011 07:23:59 -0000 1.10 +++ libiberty/setenv.c 17 Mar 2013 19:03:07 -0000 @@ -63,8 +63,11 @@ #define __environ environ #ifndef HAVE_ENVIRON_DECL +/* MinGW defines environ to call a function. */ +#ifndef environ extern char **environ; #endif +#endif #undef setenv #undef unsetenv