diff options
| author | Jim Meyering <meyering@redhat.com> | 2008-01-17 10:20:24 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-01-17 10:53:44 +0100 |
| commit | 27d1636b332084227ca81efced5b90cbe01a1310 (patch) | |
| tree | e6209ee077f8fd343660ef2839bcc8ce9ac7cc21 | |
| parent | 0702758ca464da65b4333d63665f104de88b00b4 (diff) | |
| download | coreutils-27d1636b332084227ca81efced5b90cbe01a1310.tar.xz | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gl/lib/randread.c | 4 | ||||
| -rw-r--r-- | src/system.h | 4 |
3 files changed, 12 insertions, 4 deletions
@@ -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 9f65db676..8dfb899a9 100644 --- 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 0cd0804ce..54c8a8b3d 100644 --- 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 |