Re: [RFA] gdb.base/shr1.c: Avoid preprocessor conflict on IRIX

[Fernando Nasser <fnasser@redhat.com>]

The patch was withdrawn Michael.  See below:


--------------------------------------------------
On Jul 29,  4:24pm, Kevin Buettner wrote:


 > 	* gdb.base/shr1.c (sgi): Rename to sgi_ to avoid conflict with
 > 	implicit -Dsgi on Irix systems.


I'm withdrawing this patch.  David Anderson has convinced me that
using -Usgi is safe enough for the gdb testsuite.  I'll post a new
patch to shlib-call.exp.

My thanks to David Anderson for his comments on my patch.

Kevin
-----------------------------------------------------

Michael Snyder wrote:
> 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;
> 


-- 
Fernando Nasser
Red Hat Canada Ltd.                     E-Mail:  fnasser@redhat.com
2323 Yonge Street, Suite #300
Toronto, Ontario   M4P 2C9