diff options
| author | Alan Modra <amodra@gmail.com> | 2000-06-03 01:57:29 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2000-06-03 01:57:29 +0000 |
| commit | 859e1e49424f529b9500058fe073ab102f273ffd (patch) | |
| tree | ef9c29e29e24bd40d125c993cc24c9cc1347691f | |
| parent | b0cb5b8de293ee709fe09973b1c792ab7155816e (diff) | |
| download | binutils-859e1e49424f529b9500058fe073ab102f273ffd.zip binutils-859e1e49424f529b9500058fe073ab102f273ffd.tar.gz binutils-859e1e49424f529b9500058fe073ab102f273ffd.tar.bz2 | |
Fix name clash
| -rw-r--r-- | include/elf/ChangeLog | 6 | ||||
| -rw-r--r-- | include/elf/reloc-macros.h | 20 |
2 files changed, 16 insertions, 10 deletions
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index 9a13931..ecbae34 100644 --- 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 42174ca..9c27e89 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 |