Enable the use of __freading for glibc >= 2.7.

diff --git a/ChangeLog b/ChangeLog
index a91048b663a7e80b45c516bfa1cb11f81d7c9d0e..93bcb0494fbba620fbec5786e346f75d3e1689b2 100644 (file)
--- 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

diff --git a/lib/freading.c b/lib/freading.c
index cbe4d7e7537619728cea86d0b8f89f5f14e09060..a2c6fe65420fcd1b533e3175a41c2eb87e57339e 100644 (file)
--- 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)

diff --git a/lib/freading.h b/lib/freading.h
index a4f682ddaa8ef90f57600d9225bb1a47b6a80a60..bf67b0750d85962e2aeaa79ae57a77f2c2d1de02 100644 (file)
--- 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)