diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-05-10 19:31:51 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-05-10 19:31:51 +0000 |
| commit | 14795b319a2bda6046203d932c51574fe7c93698 (patch) | |
| tree | 474a7e0836fa7f727171dfd44994f8421c2abcf2 /nss | |
| parent | eb29449a9a601f535cab50068e02aee0aa1ed379 (diff) | |
| download | glibc-14795b319a2bda6046203d932c51574fe7c93698.zip glibc-14795b319a2bda6046203d932c51574fe7c93698.tar.gz glibc-14795b319a2bda6046203d932c51574fe7c93698.tar.bz2 | |
Update from trunk.
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/getXXbyYY_r.c | 6 | ||||
| -rw-r--r-- | nss/getXXent_r.c | 20 |
2 files changed, 16 insertions, 10 deletions
diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c index b535f67..16dadd7 100644 --- a/nss/getXXbyYY_r.c +++ b/nss/getXXbyYY_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2004, 2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1996-2004, 2006, 2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -301,7 +301,9 @@ done: } -#ifndef FUNCTION2_NAME +#ifdef NO_COMPAT_NEEDED +strong_alias (INTERNAL (REENTRANT_NAME), REENTRANT_NAME); +#elif !defined FUNCTION2_NAME # include <shlib-compat.h> # if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1_2) # define OLD(name) OLD1 (name) diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c index 7a881c0..d53caef 100644 --- a/nss/getXXent_r.c +++ b/nss/getXXent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2000,2002,2004,2007 Free Software Foundation, Inc. +/* Copyright (C) 1996-2000,2002,2004,2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -170,10 +170,13 @@ INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen, } -#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 +#ifdef NO_COMPAT_NEEDED +strong_alias (INTERNAL (REENTRANT_GETNAME), REENTRANT_GETNAME); +#else +# 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 int attribute_compat_text_section @@ -189,20 +192,21 @@ OLD (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen, return ret; } -#define do_symbol_version(real, name, version) \ +# define do_symbol_version(real, name, version) \ compat_symbol (libc, real, name, version) do_symbol_version (OLD (REENTRANT_GETNAME), REENTRANT_GETNAME, GLIBC_2_0); -#endif +# endif /* As INTERNAL (REENTRANT_GETNAME) may be hidden, we need an alias in between so that the REENTRANT_GETNAME@@GLIBC_2.1.2 is not hidden too. */ strong_alias (INTERNAL (REENTRANT_GETNAME), NEW (REENTRANT_GETNAME)); -#define do_default_symbol_version(real, name, version) \ +# define do_default_symbol_version(real, name, version) \ versioned_symbol (libc, real, name, version) do_default_symbol_version (NEW (REENTRANT_GETNAME), REENTRANT_GETNAME, GLIBC_2_1_2); +#endif static_link_warning (SETFUNC_NAME) static_link_warning (ENDFUNC_NAME) |