* randread.c (__attribute__): Don't define if __attribute__ is already defined.

Otherwise, the code won't conform to C99, since
the macro arg is spelled differently by some include file, and the
compilation fails with pedantic GCC.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index e76b95d..e4c565c 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * randread.c (__attribute__): Don't define if __attribute__ is
+       already defined.  Otherwise, the code won't conform to C99, since
+       the macro arg is spelled differently by some include file, and the
+       compilation fails with pedantic GCC.
+
 2006-11-22  Jim Meyering  <jim@meyering.net>
 
        * .cvsignore, .gitignore: Add fstat.c.

diff --git a/lib/randread.c b/lib/randread.c
index b761fa5..5462d44 100644 (file)
--- a/lib/randread.c
+++ b/lib/randread.c
@@ -44,8 +44,10 @@
 # define MIN(a, b) ((a) < (b) ? (a) : (b))
 #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