diff options
| author | DJ Delorie <dj@redhat.com> | 2005-02-14 12:10:25 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2005-02-14 12:10:25 +0000 |
| commit | dc1d3ff6a0726a9946464e8502e7cbb41af629f2 (patch) | |
| tree | e1a341a2b5e42a7607a67d2b53d133256fc2b6d5 | |
| parent | 264f41f081816b2e2f80b5a0c7e1da79cda194bb (diff) | |
| download | cygnal-dc1d3ff6a0726a9946464e8502e7cbb41af629f2.tar.gz cygnal-dc1d3ff6a0726a9946464e8502e7cbb41af629f2.tar.bz2 cygnal-dc1d3ff6a0726a9946464e8502e7cbb41af629f2.zip | |
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 281897717..2d85bd3b3 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 04c3a30bb..2eeccf203 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) |