From 03277f8fe13d0dde136ee98be5dc54362ec9af17 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 29 May 2012 22:40:00 +0200 Subject: Remove use of INTDEF/INTUSE in socket --- sysdeps/mach/hurd/connect.c | 6 ++---- sysdeps/unix/inet/syscalls.list | 2 +- sysdeps/unix/sysv/linux/connect.S | 2 +- sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list | 2 +- sysdeps/unix/sysv/linux/sa_len.c | 4 ++-- sysdeps/unix/sysv/linux/x86_64/syscalls.list | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/mach/hurd/connect.c b/sysdeps/mach/hurd/connect.c index 92d3e4c..b5c57cc 100644 --- a/sysdeps/mach/hurd/connect.c +++ b/sysdeps/mach/hurd/connect.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992,94,95,96,97,2002 Free Software Foundation, Inc. +/* Copyright (C) 1992-2012 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 @@ -23,8 +23,6 @@ #include #include -#undef __connect - /* Open a connection on socket FD to peer at ADDR (which LEN bytes long). For connectionless socket types, just set the default address to send to and the only address from which to accept transmissions. @@ -73,5 +71,5 @@ __connect (int fd, __CONST_SOCKADDR_ARG addrarg, socklen_t len) return err ? __hurd_dfail (fd, err) : 0; } -INTDEF(__connect) +libc_hidden_def (__connect) weak_alias (__connect, connect) diff --git a/sysdeps/unix/inet/syscalls.list b/sysdeps/unix/inet/syscalls.list index df2f34e..aafafd1 100644 --- a/sysdeps/unix/inet/syscalls.list +++ b/sysdeps/unix/inet/syscalls.list @@ -2,7 +2,7 @@ accept - accept Ci:iBN __libc_accept accept bind - bind i:ipi __bind bind -connect - connect Ci:ipi __libc_connect __connect __connect_internal connect +connect - connect Ci:ipi __libc_connect __connect connect gethostid - gethostid i: gethostid gethostname - gethostname i:bn __gethostname gethostname getpeername - getpeername i:ibN __getpeername getpeername diff --git a/sysdeps/unix/sysv/linux/connect.S b/sysdeps/unix/sysv/linux/connect.S index 7d1fa12..21fc4a6 100644 --- a/sysdeps/unix/sysv/linux/connect.S +++ b/sysdeps/unix/sysv/linux/connect.S @@ -3,5 +3,5 @@ #define NARGS 3 #define NEED_CANCELLATION #include -strong_alias (__libc_connect, __connect_internal) weak_alias (__libc_connect, __connect) +libc_hidden_weak (__connect) diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list index 791ab9b..b826c5d 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list +++ b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list @@ -18,7 +18,7 @@ semctl - semctl i:iiii __semctl semctl # proper socket implementations: accept - accept Ci:iBN __libc_accept __accept accept bind - bind i:ipi __bind bind -connect - connect Ci:ipi __libc_connect __connect_internal __connect connect +connect - connect Ci:ipi __libc_connect __connect connect getpeername - getpeername i:ipp __getpeername getpeername getsockname - getsockname i:ipp __getsockname getsockname getsockopt - getsockopt i:iiiBN __getsockopt getsockopt diff --git a/sysdeps/unix/sysv/linux/sa_len.c b/sysdeps/unix/sysv/linux/sa_len.c index fdd7210..9ff87dc 100644 --- a/sysdeps/unix/sysv/linux/sa_len.c +++ b/sysdeps/unix/sysv/linux/sa_len.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999, 2002, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1998-2012 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 @@ -60,4 +60,4 @@ __libc_sa_len (sa_family_t af) } return 0; } -INTDEF(__libc_sa_len) +libc_hidden_def (__libc_sa_len) diff --git a/sysdeps/unix/sysv/linux/x86_64/syscalls.list b/sysdeps/unix/sysv/linux/x86_64/syscalls.list index ccddb84..2e4135f 100644 --- a/sysdeps/unix/sysv/linux/x86_64/syscalls.list +++ b/sysdeps/unix/sysv/linux/x86_64/syscalls.list @@ -20,7 +20,7 @@ syscall_clock_gettime EXTRA clock_gettime Ei:ip __syscall_clock_gettime # proper socket implementations: accept - accept Ci:iBN __libc_accept __accept accept bind - bind i:ipi __bind bind -connect - connect Ci:ipi __libc_connect __connect_internal __connect connect +connect - connect Ci:ipi __libc_connect __connect connect getpeername - getpeername i:ipp __getpeername getpeername getsockname - getsockname i:ipp __getsockname getsockname getsockopt - getsockopt i:iiiBN __getsockopt getsockopt -- cgit v1.1