mirror of git://sourceware.org/git/glibc.git
* sysdeps/unix/sysv/linux/alpha/glob.c: Include sysdeps/generic/glob.c directly instead of include_next. Add missing semicolons. * sysdeps/unix/sysv/linux/alpha/oldglob.c: Include sys/types.h. Add missing semicolons.
1998-05-21 8:16 Richard Henderson <rth@cygnus.com> * sysdeps/unix/sysv/linux/alpha/glob.c: Include sysdeps/generic/glob.c directly instead of include_next. Add missing semicolons. * sysdeps/unix/sysv/linux/alpha/oldglob.c: Include sys/types.h. Add missing semicolons.
This commit is contained in:
parent
aedc5bfc79
commit
c9a6737636
|
|
@ -1,3 +1,10 @@
|
||||||
|
1998-05-21 8:16 Richard Henderson <rth@cygnus.com>
|
||||||
|
|
||||||
|
* sysdeps/unix/sysv/linux/alpha/glob.c: Include sysdeps/generic/glob.c
|
||||||
|
directly instead of include_next. Add missing semicolons.
|
||||||
|
* sysdeps/unix/sysv/linux/alpha/oldglob.c: Include sys/types.h.
|
||||||
|
Add missing semicolons.
|
||||||
|
|
||||||
1998-05-21 Ulrich Drepper <drepper@cygnus.com>
|
1998-05-21 Ulrich Drepper <drepper@cygnus.com>
|
||||||
|
|
||||||
* iconvdata/gconv-modules: Add more aliases to please java
|
* iconvdata/gconv-modules: Add more aliases to please java
|
||||||
|
|
|
||||||
|
|
@ -17,14 +17,14 @@
|
||||||
|
|
||||||
/* For Linux/Alpha we have to make the glob symbols versioned. */
|
/* For Linux/Alpha we have to make the glob symbols versioned. */
|
||||||
#define glob(pattern, flags, errfunc, pglob) \
|
#define glob(pattern, flags, errfunc, pglob) \
|
||||||
__new_glob (pattern, flags, errfunc, pglob) \
|
__new_glob (pattern, flags, errfunc, pglob)
|
||||||
#define globfree(pglob) \
|
#define globfree(pglob) \
|
||||||
__new_globfree (pglob)
|
__new_globfree (pglob)
|
||||||
|
|
||||||
#include_next <glob.c>
|
#include <sysdeps/generic/glob.c>
|
||||||
|
|
||||||
#undef glob
|
#undef glob
|
||||||
#undef globfree
|
#undef globfree
|
||||||
|
|
||||||
default_symbol_version(__new_glob, glob, GLIBC_2.1)
|
default_symbol_version(__new_glob, glob, GLIBC_2.1);
|
||||||
default_symbol_version(__new_globfree, globfree, GLIBC_2.1)
|
default_symbol_version(__new_globfree, globfree, GLIBC_2.1);
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
/* This file contains only wrappers around the real glob functions. It
|
/* This file contains only wrappers around the real glob functions. It
|
||||||
became necessary since the glob_t structure changed. */
|
became necessary since the glob_t structure changed. */
|
||||||
|
#include <sys/types.h>
|
||||||
#include <glob.h>
|
#include <glob.h>
|
||||||
|
|
||||||
#if defined PIC && DO_VERSIONING
|
#if defined PIC && DO_VERSIONING
|
||||||
|
|
@ -74,7 +75,7 @@ __old_glob (const char *pattern, int flags,
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
symbol_version(__old_glob, glob, GLIBC_2.0)
|
symbol_version(__old_glob, glob, GLIBC_2.0);
|
||||||
|
|
||||||
|
|
||||||
/* Free storage allocated in PGLOB by a previous `glob' call. */
|
/* Free storage allocated in PGLOB by a previous `glob' call. */
|
||||||
|
|
@ -89,6 +90,6 @@ __old_globfree (old_glob_t *pglob)
|
||||||
|
|
||||||
globfree (&correct);
|
globfree (&correct);
|
||||||
}
|
}
|
||||||
symbol_version(__old_globfree, globfree, GLIBC_2.0)
|
symbol_version(__old_globfree, globfree, GLIBC_2.0);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue