diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-08-10 15:54:54 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-08-10 15:54:54 +0000 |
| commit | a5f4e34a264b7cd296f8ca890ca4eaa1d0f99317 (patch) | |
| tree | ba02529e747024948875e5f6eb93c1676a9d2144 /sysdeps/generic/glob.c | |
| parent | 0e94359046d83b56f1b15ff00c4b2f75499bf8c3 (diff) | |
| download | glibc-a5f4e34a264b7cd296f8ca890ca4eaa1d0f99317.tar glibc-a5f4e34a264b7cd296f8ca890ca4eaa1d0f99317.tar.gz glibc-a5f4e34a264b7cd296f8ca890ca4eaa1d0f99317.tar.bz2 glibc-a5f4e34a264b7cd296f8ca890ca4eaa1d0f99317.zip | |
Update.
1998-08-10 15:49 Ulrich Drepper <drepper@cygnus.com>
* include/dirent.h: Protect from double inclusion.
1998-08-09 Mark Kettenis <kettenis@phys.uva.nl>
* posix/glob.h: Add LFS support for glob and globfree.
* posix/Versions [GLIBC_2.1]: Add glob64 and globfree64.
* posix/Makefile (routines): Add glob64.
* sysdeps/generic/glob64.c: New file.
* sysdeps/unix/sysv/linux/glob64.c: New file.
* sysdeps/unix/sysv/linux/alpha/glob64.c: New file.
* sysdeps/unix/sysv/linux/sparc/sparc64/glob64.c: New file.
* sysdeps/generic/glob.c [_LIBC && glob] (__glob_pattern_p):
Elide function.
* sysdeps/unix/sysv/linux/alpha/glob.c: Add glob64 as a weak alias
for __new_glob. Likewise for globfree64.
* sysdeps/unix/sysv/linux/sparc/sparc64/glob.c: New file.
1998-08-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/Makefile ($(common-objpfx)s-proto.d): Remove
-include flag from command.
Diffstat (limited to 'sysdeps/generic/glob.c')
| -rw-r--r-- | sysdeps/generic/glob.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sysdeps/generic/glob.c b/sysdeps/generic/glob.c index 5fc094ebe7..626b0914bc 100644 --- a/sysdeps/generic/glob.c +++ b/sysdeps/generic/glob.c @@ -1121,6 +1121,8 @@ prefix_array (dirname, array, n) } +/* We must not compile this function twice. */ +#if !defined _LIBC || !defined glob /* Return nonzero if PATTERN contains any metacharacters. Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ int @@ -1155,8 +1157,9 @@ __glob_pattern_p (pattern, quote) return 0; } -#ifdef _LIBC +# ifdef _LIBC weak_alias (__glob_pattern_p, glob_pattern_p) +# endif #endif |