diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-06-11 07:11:31 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-06-11 07:11:31 +0000 |
| commit | ff276995ff38a9615a1f53249e1acf624e18d910 (patch) | |
| tree | 74a4b5cba6b6bf81cb957312e9d5a04e6c58cb3c /lib | |
| parent | d9f0cce0f493db842bdb5a59fb1f26921fc89d21 (diff) | |
| download | coreutils-ff276995ff38a9615a1f53249e1acf624e18d910.tar.xz | |
(__attribute__): Don't define if already defined.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ChangeLog | 6 | ||||
| -rw-r--r-- | lib/getdate.y | 6 | ||||
| -rw-r--r-- | lib/utimens.c | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index a87c9a1d1..31f3098ad 100644 --- 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-10 Jim Meyering <jim@meyering.net> Apply this change from gnulib: diff --git a/lib/getdate.y b/lib/getdate.y index cfa299f38..018504825 100644 --- 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 diff --git a/lib/utimens.c b/lib/utimens.c index 11f04d1ad..1489df05c 100644 --- a/lib/utimens.c +++ b/lib/utimens.c @@ -54,8 +54,10 @@ struct utimbuf # 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 |