From: Bruno Haible <bruno@clisp.org>
Date: Sat, 13 Oct 2007 11:24:03 +0000 (+0200)
Subject: Enable the use of __freading for glibc >= 2.7.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2832d287d73187a745f3da98db2bdab6fd7c4cd;p=pspp

Enable the use of __freading for glibc >= 2.7.
---

diff --git a/ChangeLog b/ChangeLog
index a91048b663..93bcb0494f 100644
--- 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 cbe4d7e753..a2c6fe6542 100644
--- 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 a4f682ddaa..bf67b0750d 100644
--- 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)