From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-18135-listarch-gdb-patches=sourceware.cygnus.com@sources.redhat.com>
Received: (qmail 12082 invoked by alias); 27 Aug 2002 01:33:44 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 12071 invoked from network); 27 Aug 2002 01:33:44 -0000
Received: from unknown (HELO cygnus.com) (205.180.83.203)
  by sources.redhat.com with SMTP; 27 Aug 2002 01:33:44 -0000
Received: from redhat.com (reddwarf.sfbay.redhat.com [172.16.24.50])
	by runyon.cygnus.com (8.8.7-cygnus/8.8.7) with ESMTP id SAA09985;
	Mon, 26 Aug 2002 18:26:47 -0700 (PDT)
Message-ID: <3D6AD6F4.7CCADBB3@redhat.com>
Date: Mon, 26 Aug 2002 18:39:00 -0000
From: Michael Snyder <msnyder@redhat.com>
Organization: Red Hat, Inc.
X-Accept-Language: en
MIME-Version: 1.0
To: Kevin Buettner <kevinb@redhat.com>
CC: gdb-patches@sources.redhat.com
Subject: Re: [RFA] gdb.base/shr1.c: Avoid preprocessor conflict on IRIX
References: <1020729232427.ZM11833@localhost.localdomain>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-SW-Source: 2002-08/txt/msg00885.txt.bz2

Kevin Buettner wrote:
> 
> Another Irix change.  I don't really like this change; I played around
> with compiler options in an attempt to avoid changing the source code,
> but the only one that I came up with which might work is -Usgi.  But
> that's dangerous because there may be a system header which depends upon
> ``sgi''.
> 
> So, I relunctantly submit the following patch for approval...
> 
>         * gdb.base/shr1.c (sgi): Rename to sgi_ to avoid conflict with
>         implicit -Dsgi on Irix systems.

Kevin, did anyone reply?
I think this change is OK -- sgi was wrong to clobber this legal
identifier.


> Index: testsuite/gdb.base/shr1.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/testsuite/gdb.base/shr1.c,v
> retrieving revision 1.1.1.2
> diff -u -p -r1.1.1.2 shr1.c
> --- testsuite/gdb.base/shr1.c   28 Jun 1999 16:04:00 -0000      1.1.1.2
> +++ testsuite/gdb.base/shr1.c   29 Jul 2002 22:28:00 -0000
> @@ -4,7 +4,7 @@
>  typedef float f;
> 
>  float sg = 5.5;
> -int sgi = 2;
> +int sgi_ = 2;
>  static int sgs = 7;
> 
>  #ifdef PROTOTYPES
> @@ -23,7 +23,7 @@ int x;
>    }
>    mumble = 7.7;
>    sg = 6.6;
> -  sgi++;
> +  sgi_++;
>    sgs = 8;
>    printf("address of sgs is 0x%x\n", &sgs);
>    return 2*x;