From 16710d582967555671fc8f4a188bbea7432f2e7d Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 27 Mar 2000 05:18:47 +0000 Subject: * dlfcn/dlopen.c: Use 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. --- hurd/compat-20.c | 9 +++++++-- hurd/hurdinit.c | 14 +++----------- 2 files changed, 10 insertions(+), 13 deletions(-) (limited to 'hurd') diff --git a/hurd/compat-20.c b/hurd/compat-20.c index 75d51ce9f7..d48e22ac3c 100644 --- a/hurd/compat-20.c +++ b/hurd/compat-20.c @@ -1,5 +1,5 @@ /* Old-versioned functions for binary compatibility with glibc-2.0. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2000 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 @@ -24,9 +24,14 @@ These definitions can be removed when the soname changes. */ +#include +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) + void _hurd_proc_init_compat_20 (char **argv) { _hurd_proc_init (argv, NULL, 0); } -symbol_version (_hurd_proc_init_compat_20, _hurd_proc_init, GLIBC_2.0); +compat_symbol (libc, _hurd_proc_init_compat_20, _hurd_proc_init, GLIBC_2_0); + +#endif diff --git a/hurd/hurdinit.c b/hurd/hurdinit.c index 7e2fe01c83..2345d3472c 100644 --- a/hurd/hurdinit.c +++ b/hurd/hurdinit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992,93,94,95,96,97,98,99 Free Software Foundation, Inc. +/* Copyright (C) 1992,93,94,95,96,97,98,99,2000 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 @@ -170,16 +170,8 @@ _hurd_new_proc_init (char **argv, __msg_sig_post (_hurd_msgport, SIGTRAP, 0, __mach_task_self ()); } -/* XXX Remove this versioning stuff and rename __new_hurd_proc_init - above back to _hurd_proc_init when we bump the libc soname. */ - -#if defined PIC && DO_VERSIONING -default_symbol_version (_hurd_new_proc_init, _hurd_proc_init, GLIBC_2.1); -#else -# ifdef weak_alias -weak_alias (_hurd_new_proc_init, _hurd_proc_init) -# endif -#endif +#include +versioned_symbol (libc, _hurd_new_proc_init, _hurd_proc_init, GLIBC_2_1); /* Called when we get a message telling us to change our proc server port. */ -- cgit 1.4.1