Fix name clash

diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 9a13931b9248e8d467fba681f7d1e38065f08364..ecbae349f55d10bc351b4e4009f81ba2a667eae4 100644 (file)
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-03  Alan Modra  <alan@linuxcare.com.au>
+
+       * reloc-macros.h (START_RELOC_NUMBERS): Fix name clash for
+       !__STDC__ case.
+       (RELOC_NUMBER): Use ansi stringify if ALMOST_STDC defined.
+
 2000-05-22  Richard Henderson  <rth@cygnus.com>
 
        * ia64.h (R_IA64_PCREL60B, R_IA64_PCREL21BI): New.

diff --git a/include/elf/reloc-macros.h b/include/elf/reloc-macros.h
index 42174caeeaecaad454573fd362c5ed21b6f2e828..9c27e8930d643ee7b2f2e94e21997f830a403222 100644 (file)
--- 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