diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-08-14 00:57:30 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-08-14 00:57:30 +0000 |
| commit | 7e3399b393acab468d6ea8b13f6a187db6c8de24 (patch) | |
| tree | d8c66d0489bfda4ea81fbc5cc0237355ce14b515 /sysdeps/generic | |
| parent | 319d719d86e2278ecca219c099c5d6d343a576a1 (diff) | |
| download | glibc-7e3399b393acab468d6ea8b13f6a187db6c8de24.tar glibc-7e3399b393acab468d6ea8b13f6a187db6c8de24.tar.gz glibc-7e3399b393acab468d6ea8b13f6a187db6c8de24.tar.bz2 glibc-7e3399b393acab468d6ea8b13f6a187db6c8de24.zip | |
Update.
* nss/Makefile: Remove rules to build and distribute nss_db.
* sysdeps/generic/alphasort64.c: Remove unnecessary versioning.
* sysdeps/generic/scandir64.c: Likewise.
* sysdeps/generic/versionsort64.c: Likewise.
2000-08-13 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/alphasort64.c | 11 | ||||
| -rw-r--r-- | sysdeps/generic/scandir64.c | 22 | ||||
| -rw-r--r-- | sysdeps/generic/versionsort64.c | 11 |
3 files changed, 7 insertions, 37 deletions
diff --git a/sysdeps/generic/alphasort64.c b/sysdeps/generic/alphasort64.c index 3e634c85bd..da801b9f04 100644 --- a/sysdeps/generic/alphasort64.c +++ b/sysdeps/generic/alphasort64.c @@ -20,17 +20,8 @@ #include <string.h> int -__alphasort64 (const void *a, const void *b) +alphasort64 (const void *a, const void *b) { return strcoll ((*(const struct dirent64 **) a)->d_name, (*(const struct dirent64 **) b)->d_name); } - -#include <shlib-compat.h> - -versioned_symbol (libc, __alphasort64, alphasort64, GLIBC_2_2); - -#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) -strong_alias (__alphasort64, __old_alphasort64) -compat_symbol (libc, __old_alphasort64, alphasort64, GLIBC_2_1); -#endif diff --git a/sysdeps/generic/scandir64.c b/sysdeps/generic/scandir64.c index fff583c7a3..f7288a75ed 100644 --- a/sysdeps/generic/scandir64.c +++ b/sysdeps/generic/scandir64.c @@ -18,25 +18,13 @@ #include <dirent.h> -#define SCANDIR __scandir64 +#define SCANDIR scandir64 #define READDIR __readdir64 #define DIRENT_TYPE struct dirent64 -int __scandir64 (__const char *__restrict __dir, - struct dirent64 ***__restrict __namelist, - int (*__selector) (__const struct dirent64 *), - int (*__cmp) (__const void *, __const void *)); +int scandir64 (__const char *__restrict __dir, + struct dirent64 ***__restrict __namelist, + int (*__selector) (__const struct dirent64 *), + int (*__cmp) (__const void *, __const void *)); #include <dirent/scandir.c> - -#undef SCANDIR -#undef READDIR - -#include <shlib-compat.h> - -versioned_symbol (libc, __scandir64, scandir64, GLIBC_2_2); - -#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) -strong_alias (__scandir64, __old_scandir64) -compat_symbol (libc, __old_scandir64, scandir64, GLIBC_2_1); -#endif diff --git a/sysdeps/generic/versionsort64.c b/sysdeps/generic/versionsort64.c index 8b01af1c89..24314d356a 100644 --- a/sysdeps/generic/versionsort64.c +++ b/sysdeps/generic/versionsort64.c @@ -20,17 +20,8 @@ #include <string.h> int -__versionsort64 (const void *a, const void *b) +versionsort64 (const void *a, const void *b) { return __strverscmp ((*(const struct dirent64 **) a)->d_name, (*(const struct dirent64 **) b)->d_name); } - -#include <shlib-compat.h> - -versioned_symbol (libc, __versionsort64, versionsort64, GLIBC_2_2); - -#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) -strong_alias (__versionsort64, __old_versionsort64) -compat_symbol (libc, __old_versionsort64, versionsort64, GLIBC_2_1); -#endif |