about summary refs log tree commit diff
path: root/include/sys
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2012-05-29 22:40:00 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2012-05-31 00:34:41 +0200
commit03277f8fe13d0dde136ee98be5dc54362ec9af17 (patch)
treef1840e2478bcb2b2913ec329b09342284e193983 /include/sys
parent6bd976963f65990e1099eb4e08946bdb5191dc9c (diff)
downloadglibc-03277f8fe13d0dde136ee98be5dc54362ec9af17.tar.gz
glibc-03277f8fe13d0dde136ee98be5dc54362ec9af17.tar.xz
glibc-03277f8fe13d0dde136ee98be5dc54362ec9af17.zip
Remove use of INTDEF/INTUSE in socket
Diffstat (limited to 'include/sys')
-rw-r--r--include/sys/socket.h16
1 files changed, 3 insertions, 13 deletions
diff --git a/include/sys/socket.h b/include/sys/socket.h
index eac82136dd..e356b75b99 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -57,8 +57,7 @@ extern ssize_t __libc_recvfrom (int __fd, void *__restrict __buf, size_t __n,
 extern int __libc_connect (int __fd, __CONST_SOCKADDR_ARG __addr,
 			   socklen_t __len);
 extern int __connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len);
-extern int __connect_internal (int __fd, __CONST_SOCKADDR_ARG __addr,
-			       socklen_t __len) attribute_hidden;
+libc_hidden_proto (__connect)
 
 /* Read N bytes into BUF from socket FD.
    Returns the number read or -1 for errors.
@@ -144,17 +143,8 @@ extern int __libc_accept4 (int __fd, __SOCKADDR_ARG __addr,
 # define SA_LEN(_x)      (_x)->sa_len
 #else
 extern int __libc_sa_len (sa_family_t __af);
-extern int __libc_sa_len_internal (sa_family_t __af) attribute_hidden;
-# ifndef NOT_IN_libc
-#  define SA_LEN(_x)      INTUSE(__libc_sa_len)((_x)->sa_family)
-# else
-#  define SA_LEN(_x)      __libc_sa_len((_x)->sa_family)
-# endif
-#endif
-
-
-#ifndef NOT_IN_libc
-# define __connect(fd, addr, len) INTUSE(__connect) (fd, addr, len)
+libc_hidden_proto (__libc_sa_len)
+# define SA_LEN(_x)      __libc_sa_len((_x)->sa_family)
 #endif
 
 #ifdef SOCK_CLOEXEC