Mercurial > hg > octave-nkf > gnulib-hg
changeset 9337:8df9b5f6609e
Enable the use of __freading for glibc >= 2.7.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sat, 13 Oct 2007 13:24:03 +0200 |
parents | 5c22ca8dc833 |
children | ac948d4118d2 |
files | ChangeLog lib/freading.c lib/freading.h |
diffstat | 3 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-13 Bruno Haible <bruno@clisp.org> + + * lib/freading.h (freading): Enable the use of __freading for + glibc >= 2.7. + * lib/freading.c (freading): Likewise. + 2007-10-12 Paul Eggert <eggert@cs.ucla.edu> * lib/argp-fmtstream.h (ARGP_FS_EI): Work around GCC 4.2.1 diagnostic
--- a/lib/freading.c +++ b/lib/freading.c @@ -19,9 +19,9 @@ /* Specification. */ #include "freading.h" -/* Don't use glibc's __freading function, see +/* Don't use glibc's __freading function in glibc < 2.7, see <http://sourceware.org/bugzilla/show_bug.cgi?id=4359> */ -#if !(HAVE___FREADING && !defined __GLIBC__) +#if !(HAVE___FREADING && (!defined __GLIBC__ || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))) bool freading (FILE *fp)
--- a/lib/freading.h +++ b/lib/freading.h @@ -32,7 +32,8 @@ STREAM must not be wide-character oriented. */ -#if HAVE___FREADING && !defined __GLIBC__ /* Solaris >= 7, not glibc >= 2.2 */ +#if HAVE___FREADING && (!defined __GLIBC__ || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) +/* Solaris >= 7, not glibc >= 2.2, but glibc >= 2.7 */ # include <stdio_ext.h> # define freading(stream) (__freading (stream) != 0)