Do not define-away __attribute__ when __STRICT_ANSI__ is set.

* src/system.h (__attribute__): Remove the __STRICT_ANSI__ disjunct.
It has been unnecessary since approximately gcc-2.6, and now, leaving
it would cause gcc -Werror -ansi to fail to compile csplit.c.
* gl/lib/randread.c (__attribute__): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 1c2f457a15b5f6d884f4664e24cb0f72041f0ce6..bc45537c72560a0a0f691a1505b815a2edb97052 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-17  Jim Meyering  <meyering@redhat.com>
+
+       Do not define-away __attribute__ when __STRICT_ANSI__ is set.
+       * src/system.h (__attribute__): Remove the __STRICT_ANSI__ disjunct.
+       It has been unnecessary since approximately gcc-2.6, and now, leaving
+       it would cause gcc -Werror -ansi to fail to compile csplit.c.
+       * gl/lib/randread.c (__attribute__): Likewise.
+
 2008-01-16  Jim Meyering  <meyering@redhat.com>
 
        * NEWS: Mention the configure.ac fix.

diff --git a/gl/lib/randread.c b/gl/lib/randread.c
index 9f65db6762354df02cd151658c42c38c2d2bac71..8dfb899a9fda405fcb06b1cff7e8defda212ceeb 100644 (file)
--- a/gl/lib/randread.c
+++ b/gl/lib/randread.c
@@ -1,6 +1,6 @@
 /* Generate buffers of random data.
 
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #endif
 
 #ifndef __attribute__
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
 #  define __attribute__(x)
 # endif
 #endif

diff --git a/src/system.h b/src/system.h
index 0cd0804ce3ea4e973039cc411328613b5ee9aec6..54c8a8b3d7fd0df9adc4ce675008e293fefa1bb5 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,5 +1,5 @@
 /* system-dependent definitions for coreutils
-   Copyright (C) 1989, 1991-2007 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1991-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -473,7 +473,7 @@ enum
 #endif
 
 #ifndef __attribute__
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
 #  define __attribute__(x) /* empty */
 # endif
 #endif