This commit was manufactured by cvs2svn to create branch 'gdb-gdb-premipsmulti-2000-06-06-branchpointgdb-premipsmulti-2000-06-06-branch

premipsmulti-2000-06-06-branch'.

Sprout from gdb_5_0-2000-04-10-branch 2000-04-09 12:17:37 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch'
Cherrypick from master 2000-06-03 01:57:29 UTC Alan Modra <modra@gmail.com> 'Fix name clash':
    ChangeLog
    MAINTAINERS
    Makefile.in
    config.guess
    config.sub
    configure
    configure.in
    djunpack.bat
    include/ChangeLog
    include/bfdlink.h
    include/coff/ChangeLog
    include/coff/ia64.h
    include/coff/internal.h
    include/coff/pe.h
    include/coff/rs6k64.h
    include/coff/ti.h
    include/dis-asm.h
    include/elf/ChangeLog
    include/elf/common.h
    include/elf/ia64.h
    include/elf/mips.h
    include/elf/mn10300.h
    include/elf/reloc-macros.h
    include/filenames.h
    include/floatformat.h
    include/opcode/ChangeLog
    include/opcode/cgen.h
    include/opcode/d10v.h
    include/opcode/h8300.h
    include/opcode/hppa.h
    include/opcode/i386.h
    include/opcode/ia64.h
    include/opcode/ppc.h
    include/opcode/tic54x.h
    ltmain.sh
    texinfo/texinfo.tex

1 files changed, 10 insertions, 10 deletions

diff --git a/include/elf/reloc-macros.h b/include/elf/reloc-macros.h
index 42174caee..9c27e8930 100644
--- a/include/elf/reloc-macros.h
+++ b/include/elf/reloc-macros.h
@@ -1,5 +1,5 @@
 /* Generic relocation support for BFD.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -59,7 +59,7 @@
    	   }
    	}
    */
-   
+
 #ifndef _RELOC_MACROS_H
 #define _RELOC_MACROS_H
 
@@ -78,15 +78,15 @@ name (rtype)							\
   switch (rtype)						\
   {
 
-#ifdef __STDC__					  
+#if defined (__STDC__) || defined (ALMOST_STDC)
 #define RELOC_NUMBER(name, number)  case number : return #name ;
 #else
 #define RELOC_NUMBER(name, number)  case number : return "name" ;
 #endif
 
-#define FAKE_RELOC(name, number)    
+#define FAKE_RELOC(name, number)
 #define EMPTY_RELOC(name)
-					  
+
 #define END_RELOC_NUMBERS	\
     default: return NULL;	\
   }				\
@@ -100,15 +100,15 @@ name (rtype)							\
    to -1 so that the first real entry will still default to 0).  Further
    entries then prepend a comma to their definitions, creating a list
    of enumerator entries that will satisfy these compilers.  */
-#ifdef __STDC__
+#if defined (__STDC__) || defined (ALMOST_STDC)
 #define START_RELOC_NUMBERS(name)   enum name { _##name = -1
 #else
-#define START_RELOC_NUMBERS(name)   enum name { name = -1
+#define START_RELOC_NUMBERS(name)   enum name { _/**/name = -1
 #endif
-						
+
 #define RELOC_NUMBER(name, number)  , name = number
-#define FAKE_RELOC(name, number)    , name = number 
-#define EMPTY_RELOC(name)           , name 
+#define FAKE_RELOC(name, number)    , name = number
+#define EMPTY_RELOC(name)           , name
 #define END_RELOC_NUMBERS           };
 
 #endif