diff options
| author | Andreas Jaeger <aj@suse.de> | 2002-06-03 06:50:10 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2002-06-03 06:50:10 +0000 |
| commit | 10598c0f30fef7c1ecf5a53d107f7beb9e3776bb (patch) | |
| tree | 686faaf30e9937d16c41bd752b70b5dce95ad7be | |
| parent | bb287ad59ae2fcd53b0bcdf928f657c5895dad77 (diff) | |
| download | glibc-10598c0f30fef7c1ecf5a53d107f7beb9e3776bb.tar.gz glibc-10598c0f30fef7c1ecf5a53d107f7beb9e3776bb.tar.xz glibc-10598c0f30fef7c1ecf5a53d107f7beb9e3776bb.zip | |
Merge from mainline.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/errlist.c | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index fb3034d5c6..e18d195558 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-05-19 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/errlist.c: Remove extra weak alias + definiton of _old_sys_nerr. Define _old_sys_errlist as strong + alias. + 2002-05-30 Ulrich Drepper <drepper@redhat.com> * po/sk.po: Update from translation team. diff --git a/sysdeps/unix/sysv/linux/errlist.c b/sysdeps/unix/sysv/linux/errlist.c index 07fb70d976..8ea2f4a336 100644 --- a/sysdeps/unix/sysv/linux/errlist.c +++ b/sysdeps/unix/sysv/linux/errlist.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -38,10 +38,9 @@ extern const char *const *__old_sys_errlist; const int __old_sys_nerr = OLD_ERRLIST_SIZE; strong_alias (__old_sys_nerr, _old_sys_nerr); -weak_alias (__old_sys_nerr, _old_sys_nerr) compat_symbol (libc, __old_sys_nerr, _sys_nerr, GLIBC_2_0); compat_symbol (libc, _old_sys_nerr, sys_nerr, GLIBC_2_0); -weak_alias (__old_sys_errlist, _old_sys_errlist); +strong_alias (__old_sys_errlist, _old_sys_errlist); compat_symbol (libc, __old_sys_errlist, _sys_errlist, GLIBC_2_0); compat_symbol (libc, _old_sys_errlist, sys_errlist, GLIBC_2_0); #endif |