AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ulrich Drepper 2011-09-05 17:31:23 -04:00
parent 554881ef20
commit d48e586806
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2011-09-05 Ulrich Drepper <drepper@gmail.com> 2011-09-05 Ulrich Drepper <drepper@gmail.com>
[BZ #13150]
* posix/glob.h: Remove gcc 1.x support.
[BZ #13068] [BZ #13068]
* elf/dl-misc.c (_dl_sysdep_read_whole_file): Use O_CLOEXEC. * elf/dl-misc.c (_dl_sysdep_read_whole_file): Use O_CLOEXEC.

2
NEWS
View File

@ -10,7 +10,7 @@ Version 2.15
* The following bugs are resolved with this release: * The following bugs are resolved with this release:
9696, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007, 13021, 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 * New program pldd to list loaded object of a process
Implemented by Ulrich Drepper. Implemented by Ulrich Drepper.

19
posix/glob.h
View File

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