diff options
| author | Roland McGrath <roland@gnu.org> | 2000-03-27 05:18:47 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2000-03-27 05:18:47 +0000 |
| commit | 16710d582967555671fc8f4a188bbea7432f2e7d (patch) | |
| tree | d5d70f9fa5a6fb14db92c24d6c40248f37cfd9f8 /nss | |
| parent | 54f6cbb3795fbc9c65965a88e3cd2a60d05acc6d (diff) | |
| download | glibc-16710d582967555671fc8f4a188bbea7432f2e7d.tar.gz glibc-16710d582967555671fc8f4a188bbea7432f2e7d.tar.xz glibc-16710d582967555671fc8f4a188bbea7432f2e7d.zip | |
* dlfcn/dlopen.c: Use <shlib-compat.h> macros.
* dlfcn/dlopenold.c: Likewise. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent_r.c: Likewise. * hurd/hurdinit.c: Likewise. * hurd/compat-20.c: Likewise. * libio/oldiofopen.c: Likewise. * libio/oldiofclose.c: Likewise. * libio/oldiofdopen.c: Likewise. * libio/oldfileops.c: Likewise. * libio/oldstdfiles.c: Likewise. * libio/oldiofsetpos.c: Likewise. * libio/oldiofgetpos.c: Likewise. * libio/oldiofgetpos64.c: Likewise. * libio/oldiofsetpos64.c: Likewise. * libio/oldiopopen.c: Likewise. * libio/oldpclose.c: Likewise. * libio/oldtmpfile.c: Likewise. * libio/freopen.c (freopen): Likewise. * libio/iofclose.c (_IO_new_fclose): Likewise.
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/getXXbyYY_r.c | 16 | ||||
| -rw-r--r-- | nss/getXXent_r.c | 18 |
2 files changed, 19 insertions, 15 deletions
diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c index c3d2010434..230fb1a50c 100644 --- a/nss/getXXbyYY_r.c +++ b/nss/getXXbyYY_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996,97,98,99,2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -215,7 +215,9 @@ done: return status == NSS_STATUS_SUCCESS ? 0 : errno; } -#if defined SHARED && DO_VERSIONING + +#include <shlib-compat.h> +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1_2) #define OLD(name) OLD1 (name) #define OLD1(name) __old_##name @@ -233,13 +235,13 @@ OLD (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer, } #define do_symbol_version(real, name, version) \ - symbol_version(real, name, version) -do_symbol_version(OLD (REENTRANT_NAME), REENTRANT_NAME, GLIBC_2.0); + compat_symbol (libc, real, name, version) +do_symbol_version (OLD (REENTRANT_GETNAME), REENTRANT_NAME, GLIBC_2_0); #define do_default_symbol_version(real, name, version) \ - default_symbol_version(real, name, version) -do_default_symbol_version(INTERNAL (REENTRANT_NAME), REENTRANT_NAME, - GLIBC_2.1.2); + versioned_symbol (libc, real, name, version) +do_default_symbol_version (INTERNAL (REENTRANT_NAME), + REENTRANT_NAME, GLIBC_2_1_2); #else #define do_weak_alias(n1, n2) weak_alias (n1, n2) do_weak_alias (INTERNAL (REENTRANT_NAME), REENTRANT_NAME) diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c index 6f6f22ad0b..e0ba98b59a 100644 --- a/nss/getXXent_r.c +++ b/nss/getXXent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996,97,98,99,2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -290,7 +290,10 @@ INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen, *result = status == NSS_STATUS_SUCCESS ? resbuf : NULL; return status == NSS_STATUS_SUCCESS ? 0 : errno; } -#if defined SHARED && DO_VERSIONING + + +#include <shlib-compat.h> +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1_2) #define OLD(name) OLD1 (name) #define OLD1(name) __old_##name @@ -308,14 +311,13 @@ OLD (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen, } #define do_symbol_version(real, name, version) \ - symbol_version(real, name, version) -do_symbol_version(OLD (REENTRANT_GETNAME), REENTRANT_GETNAME, - GLIBC_2.0); + compat_symbol (libc, real, name, version) +do_symbol_version (OLD (REENTRANT_GETNAME), REENTRANT_GETNAME, GLIBC_2_0); #define do_default_symbol_version(real, name, version) \ - default_symbol_version(real, name, version) -do_default_symbol_version(INTERNAL (REENTRANT_GETNAME), - REENTRANT_GETNAME, GLIBC_2.1.2); + versioned_symbol (libc, real, name, version) +do_default_symbol_version (INTERNAL (REENTRANT_GETNAME), + REENTRANT_GETNAME, GLIBC_2_1_2); #else #define do_weak_alias(n1, n2) weak_alias (n1, n2) do_weak_alias (INTERNAL (REENTRANT_GETNAME), REENTRANT_GETNAME) |