(__attribute__): Don't define if already defined.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index a87c9a1d197f88aea7fd514151dfa87eb44baf73..31f3098ad8c5809d4ef730aa84388093b08790bf 100644 (file)
--- 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 cfa299f38a4f9b2c55efd1b9a8123db193ad2ad3..0185048251bb1423ecf170b78869183fdd1d712c 100644 (file)
--- 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 11f04d1ad8ded81b93565d87435dfebea1c566f7..1489df05caeb0752acdf92a4cafef59aa56ae51f 100644 (file)
--- 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