aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-09-05 17:31:23 -0400
committerUlrich Drepper <drepper@gmail.com>2011-09-05 17:31:23 -0400
commitd48e586806e3a2a676c60b9b1bf321b0d097fab4 (patch)
tree5b21faf2a0b158794d10d1d20e83845423cd6f0d
parent554881ef206db3e749602309fdb6b191e7ed09b4 (diff)
downloadglibc-d48e586806e3a2a676c60b9b1bf321b0d097fab4.zip
glibc-d48e586806e3a2a676c60b9b1bf321b0d097fab4.tar.gz
glibc-d48e586806e3a2a676c60b9b1bf321b0d097fab4.tar.bz2
Fix glob.h header by removing gcc 1.x support
-rw-r--r--ChangeLog3
-rw-r--r--NEWS2
-rw-r--r--posix/glob.h19
3 files changed, 7 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 4419b9b..8a45478 100644
--- 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 c7bb2c6..a9f951a 100644
--- 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 89a1886..a5153e8 100644
--- 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;