Fix glob.h header by removing gcc 1.x support

diff --git a/ChangeLog b/ChangeLog
index 4419b9b42c30c504c10b844eb64d4d3f4cf8cd78..8a45478c8e621c3f52b05befa2a26e57f524d3d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-09-05  Ulrich Drepper  <drepper@gmail.com>
 
+       [BZ #13150]
+       * posix/glob.h: Remove gcc 1.x support.
+
        [BZ #13068]
        * elf/dl-misc.c (_dl_sysdep_read_whole_file): Use O_CLOEXEC.
 

diff --git a/NEWS b/NEWS
index c7bb2c646d5d9f2a0c19105ae38211da43903e5a..a9f951a473b66add6bd7257e0389354dc8a94371 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.15
 * The following bugs are resolved with this release:
 
   9696, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007, 13021,
-  13068, 13114, 13144
+  13068, 13114, 13144, 13150
 
 * New program pldd to list loaded object of a process
   Implemented by Ulrich Drepper.

diff --git a/posix/glob.h b/posix/glob.h
index 89a1886b29362880980f95568386aefe131ea6a5..a5153e8e0e0de874c9c195db47de35b2307b95f9 100644 (file)
--- a/posix/glob.h
+++ b/posix/glob.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1995-1998,2000,2001,2004,2010
+/* Copyright (C) 1991,1992,1995-1998,2000,2001,2004,2010,2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -26,17 +26,9 @@ __BEGIN_DECLS
 
 /* We need `size_t' for the following definitions.  */
 #ifndef __size_t
-# if defined __GNUC__ && __GNUC__ >= 2
 typedef __SIZE_TYPE__ __size_t;
-#  if defined __USE_XOPEN || __USE_XOPEN2K8
+# if defined __USE_XOPEN || __USE_XOPEN2K8
 typedef __SIZE_TYPE__ size_t;
-#  endif
-# else
-#  include <stddef.h>
-#  ifndef __size_t
-#   define __size_t size_t
-#  endif
-# endif
 #else
 /* The GNU CC stddef.h version defines __size_t as empty.  We need a real
    definition.  */
@@ -143,11 +135,6 @@ typedef struct
   } glob64_t;
 #endif
 
-#if __USE_FILE_OFFSET64 && __GNUC__ < 2
-# define glob glob64
-# define globfree globfree64
-#endif
-
 /* Do glob searching for PATTERN, placing results in PGLOB.
    The bits defined above may be set in FLAGS.
    If a directory cannot be opened or read and ERRFUNC is not nil,
@@ -156,7 +143,7 @@ typedef struct
    `glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
    If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
    Otherwise, `glob' returns zero.  */
-#if !defined __USE_FILE_OFFSET64 || __GNUC__ < 2
+#if !defined __USE_FILE_OFFSET64
 extern int glob (__const char *__restrict __pattern, int __flags,
                 int (*__errfunc) (__const char *, int),
                 glob_t *__restrict __pglob) __THROW;