X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffreading.h;h=bf67b0750d85962e2aeaa79ae57a77f2c2d1de02;hb=4565266f776db0d78b2c207a5fe79f929f9806ca;hp=9bd2eaf3abd47213a3163d5e684bfca787dea415;hpb=17fecfc4d6363d6d4127a97b42f0acbbcbd60a44;p=gnulib.git

diff --git a/lib/freading.h b/lib/freading.h
index 9bd2eaf3a..bf67b0750 100644
--- a/lib/freading.h
+++ b/lib/freading.h
@@ -1,19 +1,18 @@
 /* Retrieve information about a FILE stream.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <stdbool.h>
 #include <stdio.h>
@@ -33,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)