about summary refs log tree commit diff
path: root/libio/iopopen.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-03-21 23:09:29 +0000
committerUlrich Drepper <drepper@redhat.com>2000-03-21 23:09:29 +0000
commitfd091d3f3464d5e3c625ce89c83b4dd635aea678 (patch)
tree1f5bf7599dc8a4eacca0c21a8cb2afa0cb6b02e3 /libio/iopopen.c
parent75836bc83df5b107d90d552506fd8b49c623cb8a (diff)
downloadglibc-fd091d3f3464d5e3c625ce89c83b4dd635aea678.tar.gz
glibc-fd091d3f3464d5e3c625ce89c83b4dd635aea678.tar.xz
glibc-fd091d3f3464d5e3c625ce89c83b4dd635aea678.zip
Update.
	* libio/oldtmpfile.c: Use new macros from shlib-compat.h to define
	versions.
	* libio/iofdopen.c: Likewise.
	* libio/iofgetpos.c: Likewise.
	* libio/iofgetpos64.c: Likewise.
	* libio/iofopen.c: Likewise.
	* libio/iofsetpos.c: Likewise.
	* libio/iofsetpos64.c: Likewise.
	* libio/iopopen.c: Likewise.
	* libio/oldiofopen.c: Likewise.
	* libio/pclose.c: Likewise.
	* sysdeps/gnu/siglist.c: Likewise.
	* sysdeps/unix/sysv/linux/errlist.c: Likewise.
Diffstat (limited to 'libio/iopopen.c')
-rw-r--r--libio/iopopen.c22
1 files changed, 6 insertions, 16 deletions
diff --git a/libio/iopopen.c b/libio/iopopen.c
index 15c15023f7..9d472fa212 100644
--- a/libio/iopopen.c
+++ b/libio/iopopen.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU IO Library.
    Written by Per Bothner <bothner@cygnus.com>.
 
@@ -36,6 +36,7 @@
 #endif
 #ifdef _LIBC
 # include <unistd.h>
+# include <shlib-compat.h>
 #endif
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -299,19 +300,8 @@ static struct _IO_jump_t _IO_wproc_jumps = {
   JUMP_INIT(imbue, _IO_default_imbue)
 };
 
-#if defined PIC && DO_VERSIONING
 strong_alias (_IO_new_popen, __new_popen)
-default_symbol_version (_IO_new_popen, _IO_popen, GLIBC_2.1);
-default_symbol_version (__new_popen, popen, GLIBC_2.1);
-default_symbol_version (_IO_new_proc_open, _IO_proc_open, GLIBC_2.1);
-default_symbol_version (_IO_new_proc_close, _IO_proc_close, GLIBC_2.1);
-#else
-# ifdef strong_alias
-strong_alias (_IO_new_popen, popen)
-# endif
-# ifdef weak_alias
-weak_alias (_IO_new_popen, _IO_popen)
-weak_alias (_IO_new_proc_open, _IO_proc_open)
-weak_alias (_IO_new_proc_close, _IO_proc_close)
-# endif
-#endif
+versioned_symbol (libc, _IO_new_popen, _IO_popen, GLIBC_2_1);
+versioned_symbol (libc, __new_popen, popen, GLIBC_2_1);
+versioned_symbol (libc, _IO_new_proc_open, _IO_proc_open, GLIBC_2_1);
+versioned_symbol (libc, _IO_new_proc_close, _IO_proc_close, GLIBC_2_1);