AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-25 14:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* posix/glob.h: Cleanup namespace for non-_GNU_SOURCE case.
This commit is contained in:
Ulrich Drepper 2001-01-26 09:02:38 +00:00
parent 1e4380f8fc
commit 97ac0eafb8
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2001-01-26 Ulrich Drepper <drepper@redhat.com> 2001-01-26 Ulrich Drepper <drepper@redhat.com>
* posix/glob.h: Cleanup namespace for non-_GNU_SOURCE case.
* io/sys/stat.h: Define S_IFSOCK for XPG6. * io/sys/stat.h: Define S_IFSOCK for XPG6.
* conform/data/fcntl.h-data: posix_madvise is not expected here. * conform/data/fcntl.h-data: posix_madvise is not expected here.

24
posix/glob.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 92, 95, 96, 97, 98, 2000 Free Software Foundation, Inc. /* Copyright (C) 1991,92,95,96,97,98,2000,2001 Free Software Foundation, Inc.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as modify it under the terms of the GNU Library General Public License as
@ -106,7 +106,9 @@ typedef unsigned long int __size_t;
/* Structure describing a globbing run. */ /* Structure describing a globbing run. */
#if !defined _AMIGA && !defined VMS /* Buggy compiler. */ #if !defined _AMIGA && !defined VMS /* Buggy compiler. */
# ifdef _GNU_SOURCE
struct stat; struct stat;
# endif
#endif #endif
typedef struct typedef struct
{ {
@ -118,15 +120,26 @@ typedef struct
/* If the GLOB_ALTDIRFUNC flag is set, the following functions /* If the GLOB_ALTDIRFUNC flag is set, the following functions
are used instead of the normal file access functions. */ are used instead of the normal file access functions. */
void (*gl_closedir) __PMT ((void *)); void (*gl_closedir) __PMT ((void *));
#ifdef _GNU_SOURCE
struct dirent *(*gl_readdir) __PMT ((void *)); struct dirent *(*gl_readdir) __PMT ((void *));
#else
void *(*gl_readdir) __PMT ((void *));
#endif
__ptr_t (*gl_opendir) __PMT ((__const char *)); __ptr_t (*gl_opendir) __PMT ((__const char *));
#ifdef _GNU_SOURCE
int (*gl_lstat) __PMT ((__const char *__restrict, int (*gl_lstat) __PMT ((__const char *__restrict,
struct stat *__restrict)); struct stat *__restrict));
int (*gl_stat) __PMT ((__const char *__restrict, struct stat *__restrict)); int (*gl_stat) __PMT ((__const char *__restrict, struct stat *__restrict));
#else
int (*gl_lstat) __PMT ((__const char *__restrict, void *__restrict));
int (*gl_stat) __PMT ((__const char *__restrict, void *__restrict));
#endif
} glob_t; } glob_t;
#ifdef _LARGEFILE64_SOURCE #ifdef _LARGEFILE64_SOURCE
# ifdef _GNU_SOURCE
struct stat64; struct stat64;
# endif
typedef struct typedef struct
{ {
__size_t gl_pathc; __size_t gl_pathc;
@ -137,12 +150,21 @@ typedef struct
/* If the GLOB_ALTDIRFUNC flag is set, the following functions /* If the GLOB_ALTDIRFUNC flag is set, the following functions
are used instead of the normal file access functions. */ are used instead of the normal file access functions. */
void (*gl_closedir) __PMT ((void *)); void (*gl_closedir) __PMT ((void *));
# ifdef _GNU_SOURCE
struct dirent64 *(*gl_readdir) __PMT ((void *)); struct dirent64 *(*gl_readdir) __PMT ((void *));
# else
void *(*gl_readdir) __PMT ((void *));
# endif
__ptr_t (*gl_opendir) __PMT ((__const char *)); __ptr_t (*gl_opendir) __PMT ((__const char *));
# ifdef _GNU_SOURCE
int (*gl_lstat) __PMT ((__const char *__restrict, int (*gl_lstat) __PMT ((__const char *__restrict,
struct stat64 *__restrict)); struct stat64 *__restrict));
int (*gl_stat) __PMT ((__const char *__restrict, int (*gl_stat) __PMT ((__const char *__restrict,
struct stat64 *__restrict)); struct stat64 *__restrict));
# else
int (*gl_lstat) __PMT ((__const char *__restrict, void *__restrict));
int (*gl_stat) __PMT ((__const char *__restrict, void *__restrict));
# endif
} glob64_t; } glob64_t;
#endif #endif