From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9174 invoked by alias); 29 Jul 2002 23:24:34 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 9161 invoked from network); 29 Jul 2002 23:24:32 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sources.redhat.com with SMTP; 29 Jul 2002 23:24:32 -0000 Received: from int-mx2.corp.redhat.com (nat-pool-rdu.redhat.com [172.16.52.200] (may be forged)) by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id g6TNCKl25340 for ; Mon, 29 Jul 2002 19:12:20 -0400 Received: from potter.sfbay.redhat.com (potter.sfbay.redhat.com [172.16.27.15]) by int-mx2.corp.redhat.com (8.11.6/8.11.6) with ESMTP id g6TNOUu19042 for ; Mon, 29 Jul 2002 19:24:30 -0400 Received: from romulus.sfbay.redhat.com (remus.sfbay.redhat.com [172.16.27.252]) by potter.sfbay.redhat.com (8.11.6/8.11.6) with ESMTP id g6TNOTj21073 for ; Mon, 29 Jul 2002 16:24:29 -0700 Received: (from kev@localhost) by romulus.sfbay.redhat.com (8.11.6/8.11.6) id g6TNORi11834 for gdb-patches@sources.redhat.com; Mon, 29 Jul 2002 16:24:27 -0700 Date: Mon, 29 Jul 2002 16:36:00 -0000 From: Kevin Buettner Message-Id: <1020729232427.ZM11833@localhost.localdomain> To: gdb-patches@sources.redhat.com Subject: [RFA] gdb.base/shr1.c: Avoid preprocessor conflict on IRIX MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2002-07/txt/msg00570.txt.bz2 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. 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;