diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/sys/socket.h | 2 | ||||
| -rw-r--r-- | socket/opensock.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/opensock.c | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index e6babbbbee..4505dcef1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-08-17 Florian Weimer <fweimer@redhat.com> + + * include/sys/socket.h (__opensock): Remove internal_function. + * socket/opensock.c (__opensock): Likewise. + * sysdeps/unix/sysv/linux/opensock.c (__opensock): Likewise. + 2017-08-16 Joseph Myers <joseph@codesourcery.com> [BZ #21944] diff --git a/include/sys/socket.h b/include/sys/socket.h index a00ab3cf93..baec6e6439 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -20,7 +20,7 @@ extern int __socketpair (int __domain, int __type, int __protocol, /* Return a socket of any type. The socket can be used in subsequent ioctl calls to talk to the kernel. */ -extern int __opensock (void) internal_function attribute_hidden; +extern int __opensock (void) attribute_hidden; /* Put the address of the peer connected to socket FD into *ADDR (which is *LEN bytes long), and its actual length into *LEN. */ diff --git a/socket/opensock.c b/socket/opensock.c index 848cdd66b1..d8f88d3100 100644 --- a/socket/opensock.c +++ b/socket/opensock.c @@ -21,7 +21,7 @@ /* Return a socket of any type. The socket can be used in subsequent ioctl calls to talk to the kernel. */ -int internal_function +int __opensock (void) { /* Cache the last AF that worked, to avoid many redundant calls to diff --git a/sysdeps/unix/sysv/linux/opensock.c b/sysdeps/unix/sysv/linux/opensock.c index b8fd27f863..21508cdc75 100644 --- a/sysdeps/unix/sysv/linux/opensock.c +++ b/sysdeps/unix/sysv/linux/opensock.c @@ -24,7 +24,7 @@ /* Return a socket of any type. The socket can be used in subsequent ioctl calls to talk to the kernel. */ -int internal_function +int __opensock (void) { static int last_family; /* Available socket family we will use. */ |