Mercurial > hg > octave-lojdl > gnulib-hg
changeset 6819:3449832bdc37
* getdate.y (__attribute__): Don't define if already defined.
Problem reported by Larry Jones.
* utimens.c (__attribute__): Likewise.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sun, 11 Jun 2006 07:12:27 +0000 |
| parents | 6307ee391d59 |
| children | 137b5b70a92d |
| files | lib/ChangeLog lib/getdate.y lib/utimens.c |
| diffstat | 3 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2006-06-11 Paul Eggert <eggert@cs.ucla.edu> + + * getdate.y (__attribute__): Don't define if already defined. + Problem reported by Larry Jones. + * utimens.c (__attribute__): Likewise. + 2006-06-04 Paul Eggert <eggert@cs.ucla.edu> * regexec.c (group_nodes_into_DFAstates): Fix a buffer overrun
--- a/lib/getdate.y +++ b/lib/getdate.y @@ -87,8 +87,10 @@ of `digit' even when the host does not conform to POSIX. */ #define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9) -#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__ -# define __attribute__(x) +#ifndef __attribute__ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__ +# define __attribute__(x) +# endif #endif #ifndef ATTRIBUTE_UNUSED
--- a/lib/utimens.c +++ b/lib/utimens.c @@ -54,8 +54,10 @@ # endif #endif -#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__ -# define __attribute__(x) +#ifndef __attribute__ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__ +# define __attribute__(x) +# endif #endif #ifndef ATTRIBUTE_UNUSED