diff options
| author | DJ Delorie <dj@delorie.com> | 2005-02-14 12:10:25 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2005-02-14 12:10:25 +0000 |
| commit | 48389c4808a5aa008b7fb14c848964b79012c14a (patch) | |
| tree | fdbb4061aa03538adb77ead5287fd6d0295fbaad | |
| parent | deda04f1acca8e4290a3eacbfafbd0c478db14ea (diff) | |
| download | gdb-48389c4808a5aa008b7fb14c848964b79012c14a.tar.gz | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/ansidecl.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 28189771709..2d85bd3b3db 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2005-02-14 Paolo Bonzini <bonzini@gnu.org> + + PR bootstrap/19818 + * ansidecl.h (PARAMS): Guard from redefinition. + 2005-02-03 Alan Modra <amodra@bigpond.net.au> * bfdlink.h (struct bfd_link_hash_entry): Add u.undef.weak. diff --git a/include/ansidecl.h b/include/ansidecl.h index 04c3a30bb53..2eeccf20351 100644 --- a/include/ansidecl.h +++ b/include/ansidecl.h @@ -149,7 +149,12 @@ So instead we use the macro below and test it against specific values. */ #define PTRCONST void *const #define LONG_DOUBLE long double +/* PARAMS is often defined elsewhere (e.g. by libintl.h), so wrap it in + a #ifndef. */ +#ifndef PARAMS #define PARAMS(ARGS) ARGS +#endif + #define VPARAMS(ARGS) ARGS #define VA_START(VA_LIST, VAR) va_start(VA_LIST, VAR) |