From 3ccd02d5b9211acb4cb15177623d25e28f8cfd76 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 23 Nov 2006 01:06:42 +0100 Subject: [PATCH] * 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. --- lib/ChangeLog | 7 +++++++ lib/randread.c | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index e76b95d..e4c565c 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2006-11-22 Paul Eggert + + * 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 * .cvsignore, .gitignore: Add fstat.c. diff --git a/lib/randread.c b/lib/randread.c index b761fa5..5462d44 100644 --- 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 -- 2.7.4