next portion of libc_hidden_proto removal

42 files changed, 134 insertions, 134 deletions

diff --git a/libc/inet/ether_addr.c b/libc/inet/ether_addr.c
index 914b77c69..8ce61d241 100644
--- a/libc/inet/ether_addr.c
+++ b/libc/inet/ether_addr.c
@@ -32,7 +32,7 @@
 #include <netinet/if_ether.h>
 
 libc_hidden_proto(ether_ntoa_r)
-libc_hidden_proto(sprintf)
+/* libc_hidden_proto(sprintf) */
 #ifdef __UCLIBC_HAS_XLOCALE__
 /* libc_hidden_proto(__ctype_b_loc) */
 /* libc_hidden_proto(__ctype_tolower_loc) */
diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c
index 8046f9afe..189d52f1a 100644
--- a/libc/inet/getaddrinfo.c
+++ b/libc/inet/getaddrinfo.c
@@ -77,7 +77,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* Experimentally off - libc_hidden_proto(strchr) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(socket)
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
 libc_hidden_proto(getservbyname_r)
 libc_hidden_proto(gethostbyname2_r)
diff --git a/libc/inet/getnetent.c b/libc/inet/getnetent.c
index 5a6af1b5a..4f164237c 100644
--- a/libc/inet/getnetent.c
+++ b/libc/inet/getnetent.c
@@ -23,11 +23,11 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 libc_hidden_proto(inet_network)
 libc_hidden_proto(rewind)
-libc_hidden_proto(fgets)
+/* libc_hidden_proto(fgets) */
 /* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c
index 5b34d6de6..bfaf4917f 100644
--- a/libc/inet/getproto.c
+++ b/libc/inet/getproto.c
@@ -62,12 +62,12 @@
 #include <errno.h>
 #include <unistd.h>
 
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strpbrk) */
 libc_hidden_proto(atoi)
 libc_hidden_proto(rewind)
-libc_hidden_proto(fgets)
+/* libc_hidden_proto(fgets) */
 /* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(abort) */
 
diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c
index affdc622f..d427adff9 100644
--- a/libc/inet/getservice.c
+++ b/libc/inet/getservice.c
@@ -66,11 +66,11 @@
 
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strpbrk) */
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 libc_hidden_proto(atoi)
 libc_hidden_proto(rewind)
-libc_hidden_proto(fgets)
+/* libc_hidden_proto(fgets) */
 /* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
diff --git a/libc/inet/hostid.c b/libc/inet/hostid.c
index f16e97131..e4c592b86 100644
--- a/libc/inet/hostid.c
+++ b/libc/inet/hostid.c
@@ -16,10 +16,10 @@
 #include <unistd.h>
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(open)
+/* libc_hidden_proto(open) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(read)
-libc_hidden_proto(write)
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
 libc_hidden_proto(getuid)
 libc_hidden_proto(geteuid)
 libc_hidden_proto(gethostbyname_r)
diff --git a/libc/inet/if_index.c b/libc/inet/if_index.c
index 3badfa55e..a5b073091 100644
--- a/libc/inet/if_index.c
+++ b/libc/inet/if_index.c
@@ -37,7 +37,7 @@
 
 /* Experimentally off - libc_hidden_proto(strncpy) */
 /* Experimentally off - libc_hidden_proto(strdup) */
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 /* libc_hidden_proto(close) */
 #if __ASSUME_NETLINK_SUPPORT
 /* Experimentally off - libc_hidden_proto(strndup) */
diff --git a/libc/inet/ifaddrs.c b/libc/inet/ifaddrs.c
index c5467fcca..bdacd62df 100644
--- a/libc/inet/ifaddrs.c
+++ b/libc/inet/ifaddrs.c
@@ -39,7 +39,7 @@
 
 #include "netlinkaccess.h"
 
-libc_hidden_proto(socket)
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
 /* Experimentally off - libc_hidden_proto(time) */
 libc_hidden_proto(sendto)
diff --git a/libc/inet/ntop.c b/libc/inet/ntop.c
index f19556dcd..e24ac8de1 100644
--- a/libc/inet/ntop.c
+++ b/libc/inet/ntop.c
@@ -35,8 +35,8 @@
 /* Experimentally off - libc_hidden_proto(strchr) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(sprintf)
-libc_hidden_proto(tolower)
+/* libc_hidden_proto(sprintf) */
+/* libc_hidden_proto(tolower) */
 
 /*
  * WARNING: Don't even consider trying to compile this on a system where
diff --git a/libc/inet/opensock.c b/libc/inet/opensock.c
index a2c09dcf5..e80efb378 100644
--- a/libc/inet/opensock.c
+++ b/libc/inet/opensock.c
@@ -25,7 +25,7 @@
 #include <features.h>
 #include <libc-internal.h>
 
-libc_hidden_proto(socket)
+/* libc_hidden_proto(socket) */
 
 /* Return a socket of any type.  The socket can be used in subsequent
    ioctl calls to talk to the kernel.  */
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index c81249f02..901a7d828 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -177,9 +177,9 @@
 /* libc_hidden_proto(strnlen) */
 /* Experimentally off - libc_hidden_proto(strstr) */
 /* Experimentally off - libc_hidden_proto(strcasecmp) */
-libc_hidden_proto(socket)
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 libc_hidden_proto(random)
 libc_hidden_proto(getservbyport)
@@ -190,14 +190,14 @@ libc_hidden_proto(inet_aton)
 libc_hidden_proto(inet_pton)
 libc_hidden_proto(inet_ntop)
 libc_hidden_proto(connect)
-libc_hidden_proto(poll)
+/* libc_hidden_proto(poll) */
 libc_hidden_proto(select)
 libc_hidden_proto(recv)
 libc_hidden_proto(send)
-libc_hidden_proto(printf)
-libc_hidden_proto(sprintf)
+/* libc_hidden_proto(printf) */
+/* libc_hidden_proto(sprintf) */
 libc_hidden_proto(snprintf)
-libc_hidden_proto(fgets)
+/* libc_hidden_proto(fgets) */
 libc_hidden_proto(getnameinfo)
 libc_hidden_proto(gethostbyname)
 libc_hidden_proto(gethostbyname_r)
diff --git a/libc/inet/rpc/auth_none.c b/libc/inet/rpc/auth_none.c
index 05851025f..30649f91c 100644
--- a/libc/inet/rpc/auth_none.c
+++ b/libc/inet/rpc/auth_none.c
@@ -39,7 +39,7 @@
 #include <features.h>
 #include "rpc_private.h"
 
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(xdrmem_create) */
 libc_hidden_proto(xdr_opaque_auth)
 
 #define MAX_MARSHAL_SIZE 20
diff --git a/libc/inet/rpc/auth_unix.c b/libc/inet/rpc/auth_unix.c
index 52d9fc770..2364aff68 100644
--- a/libc/inet/rpc/auth_unix.c
+++ b/libc/inet/rpc/auth_unix.c
@@ -62,15 +62,15 @@ libc_hidden_proto(getegid)
 libc_hidden_proto(geteuid)
 libc_hidden_proto(getgroups)
 libc_hidden_proto(gethostname)
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(xdrmem_create) */
 libc_hidden_proto(xdr_authunix_parms)
 libc_hidden_proto(xdr_opaque_auth)
-libc_hidden_proto(gettimeofday)
-libc_hidden_proto(fputs)
-libc_hidden_proto(perror)
+/* libc_hidden_proto(gettimeofday) */
+/* libc_hidden_proto(fputs) */
+/* libc_hidden_proto(perror) */
 /* libc_hidden_proto(abort) */
 #ifdef USE_IN_LIBIO
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 /*
diff --git a/libc/inet/rpc/bindresvport.c b/libc/inet/rpc/bindresvport.c
index 3f266e6cc..457f1f97f 100644
--- a/libc/inet/rpc/bindresvport.c
+++ b/libc/inet/rpc/bindresvport.c
@@ -42,7 +42,7 @@
 
 /* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(bind)
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(getpid) */
 
 /*
  * Bind a socket to a privileged IP port
diff --git a/libc/inet/rpc/clnt_perror.c b/libc/inet/rpc/clnt_perror.c
index 7e6c907ce..e700e4137 100644
--- a/libc/inet/rpc/clnt_perror.c
+++ b/libc/inet/rpc/clnt_perror.c
@@ -53,11 +53,11 @@ static char sccsid[] = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
 
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(sprintf)
+/* libc_hidden_proto(sprintf) */
 libc_hidden_proto(__glibc_strerror_r)
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 #ifdef USE_IN_LIBIO
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 static char *auth_errmsg (enum auth_stat stat) internal_function;
diff --git a/libc/inet/rpc/clnt_raw.c b/libc/inet/rpc/clnt_raw.c
index b44bd38b8..9941e0894 100644
--- a/libc/inet/rpc/clnt_raw.c
+++ b/libc/inet/rpc/clnt_raw.c
@@ -48,11 +48,11 @@ static char sccsid[] = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/svc.h>
 #include <rpc/xdr.h>
 
-libc_hidden_proto(perror)
+/* libc_hidden_proto(perror) */
 libc_hidden_proto(authnone_create)
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(xdrmem_create) */
 libc_hidden_proto(xdr_callhdr)
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 libc_hidden_proto(xdr_opaque_auth)
 libc_hidden_proto(svc_getreq)
 libc_hidden_proto(_seterr_reply)
diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c
index 473543c9c..553b11bef 100644
--- a/libc/inet/rpc/clnt_tcp.c
+++ b/libc/inet/rpc/clnt_tcp.c
@@ -65,28 +65,28 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
 # include <wchar.h>
 #endif
 
-libc_hidden_proto(socket)
-libc_hidden_proto(read)
-libc_hidden_proto(write)
+/* libc_hidden_proto(socket) */
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
 /* libc_hidden_proto(close) */
 libc_hidden_proto(authnone_create)
 libc_hidden_proto(xdrrec_create)
 libc_hidden_proto(xdrrec_endofrecord)
 libc_hidden_proto(xdrrec_skiprecord)
 libc_hidden_proto(xdr_callhdr)
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 libc_hidden_proto(xdr_opaque_auth)
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(xdrmem_create) */
 libc_hidden_proto(xdr_void)
 libc_hidden_proto(pmap_getport)
 libc_hidden_proto(_seterr_reply)
 libc_hidden_proto(connect)
 libc_hidden_proto(bindresvport)
-libc_hidden_proto(poll)
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(poll) */
+/* libc_hidden_proto(fputs) */
 libc_hidden_proto(__rpc_thread_createerr)
 #ifdef USE_IN_LIBIO
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 extern u_long _create_xid (void) attribute_hidden;
diff --git a/libc/inet/rpc/clnt_udp.c b/libc/inet/rpc/clnt_udp.c
index 8e6d74b5e..3763db680 100644
--- a/libc/inet/rpc/clnt_udp.c
+++ b/libc/inet/rpc/clnt_udp.c
@@ -54,7 +54,7 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 #include <net/if.h>
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 #ifdef IP_RECVERR
@@ -63,16 +63,16 @@ libc_hidden_proto(fwprintf)
 #endif
 
 /* Experimentally off - libc_hidden_proto(memcmp) */
-libc_hidden_proto(ioctl)
-libc_hidden_proto(socket)
+/* libc_hidden_proto(ioctl) */
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
 /* CMSG_NXTHDR is using it */
 libc_hidden_proto(__cmsg_nxthdr)
 
 libc_hidden_proto(authnone_create)
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(xdrmem_create) */
 libc_hidden_proto(xdr_callhdr)
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 libc_hidden_proto(xdr_opaque_auth)
 libc_hidden_proto(pmap_getport)
 libc_hidden_proto(_seterr_reply)
@@ -81,8 +81,8 @@ libc_hidden_proto(bindresvport)
 libc_hidden_proto(recvfrom)
 libc_hidden_proto(sendto)
 libc_hidden_proto(recvmsg)
-libc_hidden_proto(poll)
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(poll) */
+/* libc_hidden_proto(fputs) */
 libc_hidden_proto(__rpc_thread_createerr)
 
 extern u_long _create_xid (void) attribute_hidden;
diff --git a/libc/inet/rpc/clnt_unix.c b/libc/inet/rpc/clnt_unix.c
index 902e37317..6de4e63b1 100644
--- a/libc/inet/rpc/clnt_unix.c
+++ b/libc/inet/rpc/clnt_unix.c
@@ -60,22 +60,22 @@
 #include <rpc/pmap_clnt.h>
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(socket)
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(getpid) */
 libc_hidden_proto(authnone_create)
 libc_hidden_proto(xdrrec_create)
 libc_hidden_proto(xdrrec_endofrecord)
 libc_hidden_proto(xdrrec_skiprecord)
 libc_hidden_proto(xdr_callhdr)
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 libc_hidden_proto(xdr_opaque_auth)
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(xdrmem_create) */
 libc_hidden_proto(xdr_void)
 libc_hidden_proto(getegid)
 libc_hidden_proto(geteuid)
@@ -84,8 +84,8 @@ libc_hidden_proto(setsockopt)
 libc_hidden_proto(connect)
 libc_hidden_proto(recvmsg)
 libc_hidden_proto(sendmsg)
-libc_hidden_proto(poll)
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(poll) */
+/* libc_hidden_proto(fputs) */
 libc_hidden_proto(__rpc_thread_createerr)
 
 extern u_long _create_xid (void) attribute_hidden;
diff --git a/libc/inet/rpc/create_xid.c b/libc/inet/rpc/create_xid.c
index e3ee4799b..b46062657 100644
--- a/libc/inet/rpc/create_xid.c
+++ b/libc/inet/rpc/create_xid.c
@@ -27,7 +27,7 @@
 
 libc_hidden_proto(lrand48_r)
 libc_hidden_proto(srand48_r)
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 
 /* The RPC code is not threadsafe, but new code should be threadsafe. */
 
diff --git a/libc/inet/rpc/get_myaddress.c b/libc/inet/rpc/get_myaddress.c
index 79d48ac4b..0006be803 100644
--- a/libc/inet/rpc/get_myaddress.c
+++ b/libc/inet/rpc/get_myaddress.c
@@ -50,10 +50,10 @@ static char sccsid[] = "@(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-libc_hidden_proto(ioctl)
-libc_hidden_proto(socket)
+/* libc_hidden_proto(ioctl) */
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(perror)
+/* libc_hidden_proto(perror) */
 /* libc_hidden_proto(exit) */
 
 /*
diff --git a/libc/inet/rpc/getrpcent.c b/libc/inet/rpc/getrpcent.c
index fbf44bec2..2730a644a 100644
--- a/libc/inet/rpc/getrpcent.c
+++ b/libc/inet/rpc/getrpcent.c
@@ -49,11 +49,11 @@
 /* Experimentally off - libc_hidden_proto(strchr) */
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 libc_hidden_proto(atoi)
 libc_hidden_proto(rewind)
-libc_hidden_proto(fgets)
+/* libc_hidden_proto(fgets) */
 
 /*
  * Internet version.
diff --git a/libc/inet/rpc/pmap_clnt.c b/libc/inet/rpc/pmap_clnt.c
index ac1b6b00d..d71378068 100644
--- a/libc/inet/rpc/pmap_clnt.c
+++ b/libc/inet/rpc/pmap_clnt.c
@@ -48,10 +48,10 @@
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
 
-libc_hidden_proto(ioctl)
-libc_hidden_proto(socket)
+/* libc_hidden_proto(ioctl) */
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(perror)
+/* libc_hidden_proto(perror) */
 /* libc_hidden_proto(exit) */
 libc_hidden_proto(clnt_perror)
 libc_hidden_proto(clntudp_bufcreate)
diff --git a/libc/inet/rpc/pmap_rmt.c b/libc/inet/rpc/pmap_rmt.c
index 0701d8ef4..037b3ede0 100644
--- a/libc/inet/rpc/pmap_rmt.c
+++ b/libc/inet/rpc/pmap_rmt.c
@@ -60,14 +60,14 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 #define MAX_BROADCAST_SIZE 1400
 
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(ioctl)
-libc_hidden_proto(perror)
-libc_hidden_proto(socket)
+/* libc_hidden_proto(ioctl) */
+/* libc_hidden_proto(perror) */
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
 libc_hidden_proto(authunix_create_default)
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(xdrmem_create) */
 libc_hidden_proto(xdr_callmsg)
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 libc_hidden_proto(xdr_reference)
 libc_hidden_proto(xdr_u_long)
 libc_hidden_proto(xdr_void)
@@ -79,7 +79,7 @@ libc_hidden_proto(clntudp_create)
 libc_hidden_proto(setsockopt)
 libc_hidden_proto(recvfrom)
 libc_hidden_proto(sendto)
-libc_hidden_proto(poll)
+/* libc_hidden_proto(poll) */
 /* libc_hidden_proto(fprintf) */
 
 
diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c
index 9636f99e6..b8e54b61e 100644
--- a/libc/inet/rpc/rcmd.c
+++ b/libc/inet/rpc/rcmd.c
@@ -95,16 +95,16 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strncmp) */
 /* Experimentally off - libc_hidden_proto(memmove) */
-libc_hidden_proto(getpid)
-libc_hidden_proto(socket)
+/* libc_hidden_proto(getpid) */
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(fcntl)
-libc_hidden_proto(read)
-libc_hidden_proto(write)
-libc_hidden_proto(perror)
-libc_hidden_proto(lstat)
-libc_hidden_proto(fstat)
-libc_hidden_proto(tolower)
+/* libc_hidden_proto(fcntl) */
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
+/* libc_hidden_proto(perror) */
+/* libc_hidden_proto(lstat) */
+/* libc_hidden_proto(fstat) */
+/* libc_hidden_proto(tolower) */
 libc_hidden_proto(sysconf)
 libc_hidden_proto(getline)
 libc_hidden_proto(geteuid)
@@ -121,13 +121,13 @@ libc_hidden_proto(bind)
 libc_hidden_proto(connect)
 libc_hidden_proto(sigblock)
 libc_hidden_proto(snprintf)
-libc_hidden_proto(poll)
+/* libc_hidden_proto(poll) */
 libc_hidden_proto(accept)
 libc_hidden_proto(listen)
 libc_hidden_proto(sigsetmask)
 libc_hidden_proto(getc_unlocked)
 libc_hidden_proto(__fgetc_unlocked)
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(fprintf) */
 libc_hidden_proto(__h_errno_location)
diff --git a/libc/inet/rpc/rexec.c b/libc/inet/rpc/rexec.c
index d40a04f6a..4a3141b6b 100644
--- a/libc/inet/rpc/rexec.c
+++ b/libc/inet/rpc/rexec.c
@@ -45,12 +45,12 @@
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strncpy) */
-libc_hidden_proto(read)
-libc_hidden_proto(write)
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(socket)
-libc_hidden_proto(perror)
-libc_hidden_proto(sprintf)
+/* libc_hidden_proto(socket) */
+/* libc_hidden_proto(perror) */
+/* libc_hidden_proto(sprintf) */
 libc_hidden_proto(snprintf)
 libc_hidden_proto(getsockname)
 libc_hidden_proto(getnameinfo)
diff --git a/libc/inet/rpc/rpc_prot.c b/libc/inet/rpc/rpc_prot.c
index 74658e654..418aae900 100644
--- a/libc/inet/rpc/rpc_prot.c
+++ b/libc/inet/rpc/rpc_prot.c
@@ -146,7 +146,7 @@ static const struct xdr_discrim reply_dscrm[3] =
 /*
  * XDR a reply message
  */
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 bool_t
 xdr_replymsg (XDR *xdrs, struct rpc_msg *rmsg)
 {
diff --git a/libc/inet/rpc/rtime.c b/libc/inet/rpc/rtime.c
index ab3110543..80962a2b7 100644
--- a/libc/inet/rpc/rtime.c
+++ b/libc/inet/rpc/rtime.c
@@ -58,13 +58,13 @@ static char sccsid[] = "@(#)rtime.c	2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 S
 #include <errno.h>
 #include <netinet/in.h>
 
-libc_hidden_proto(read)
-libc_hidden_proto(socket)
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
 libc_hidden_proto(connect)
 libc_hidden_proto(recvfrom)
 libc_hidden_proto(sendto)
-libc_hidden_proto(poll)
+/* libc_hidden_proto(poll) */
 libc_hidden_proto(rtime)
 
 #define NYEARS	(u_long)(1970 - 1900)
diff --git a/libc/inet/rpc/ruserpass.c b/libc/inet/rpc/ruserpass.c
index 47226c55f..0586516aa 100644
--- a/libc/inet/rpc/ruserpass.c
+++ b/libc/inet/rpc/ruserpass.c
@@ -49,9 +49,9 @@
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strcasecmp) */
 /* Experimentally off - libc_hidden_proto(strncasecmp) */
-libc_hidden_proto(getenv)
-libc_hidden_proto(printf)
-libc_hidden_proto(fstat)
+/* libc_hidden_proto(getenv) */
+/* libc_hidden_proto(printf) */
+/* libc_hidden_proto(fstat) */
 libc_hidden_proto(__fsetlocking)
 libc_hidden_proto(getgid)
 libc_hidden_proto(getuid)
@@ -59,7 +59,7 @@ libc_hidden_proto(getegid)
 libc_hidden_proto(geteuid)
 libc_hidden_proto(gethostname)
 libc_hidden_proto(fileno)
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 libc_hidden_proto(getc_unlocked)
 libc_hidden_proto(__fgetc_unlocked)
diff --git a/libc/inet/rpc/svc_authux.c b/libc/inet/rpc/svc_authux.c
index 64c911f93..9f2271ad2 100644
--- a/libc/inet/rpc/svc_authux.c
+++ b/libc/inet/rpc/svc_authux.c
@@ -47,8 +47,8 @@
 #include <rpc/svc.h>
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(printf)
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(printf) */
+/* libc_hidden_proto(xdrmem_create) */
 libc_hidden_proto(xdr_authunix_parms)
 
 /*
diff --git a/libc/inet/rpc/svc_raw.c b/libc/inet/rpc/svc_raw.c
index 0cdbbb89a..7f3f55bc6 100644
--- a/libc/inet/rpc/svc_raw.c
+++ b/libc/inet/rpc/svc_raw.c
@@ -45,9 +45,9 @@ static char sccsid[] = "@(#)svc_raw.c 1.15 87/08/11 Copyr 1984 Sun Micro";
 #include "rpc_private.h"
 #include <rpc/svc.h>
 
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(xdrmem_create) */
 libc_hidden_proto(xdr_callmsg)
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 
 /*
  * This is the "network" that we will be moving data over
diff --git a/libc/inet/rpc/svc_run.c b/libc/inet/rpc/svc_run.c
index 50e5fcd79..7ffff0772 100644
--- a/libc/inet/rpc/svc_run.c
+++ b/libc/inet/rpc/svc_run.c
@@ -39,9 +39,9 @@
 #include <sys/poll.h>
 #include <rpc/rpc.h>
 
-libc_hidden_proto(perror)
+/* libc_hidden_proto(perror) */
 libc_hidden_proto(svc_getreq_poll)
-libc_hidden_proto(poll)
+/* libc_hidden_proto(poll) */
 /* used by svc_[max_]pollfd */
 libc_hidden_proto(__rpc_thread_svc_pollfd)
 libc_hidden_proto(__rpc_thread_svc_max_pollfd)
diff --git a/libc/inet/rpc/svc_simple.c b/libc/inet/rpc/svc_simple.c
index a757a281f..9373c8b65 100644
--- a/libc/inet/rpc/svc_simple.c
+++ b/libc/inet/rpc/svc_simple.c
@@ -58,8 +58,8 @@ static char sccsid[] = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
 /* Experimentally off - libc_hidden_proto(strdup) */
 /* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(asprintf)
-libc_hidden_proto(fputs)
-libc_hidden_proto(write)
+/* libc_hidden_proto(fputs) */
+/* libc_hidden_proto(write) */
 /* libc_hidden_proto(exit) */
 libc_hidden_proto(svc_sendreply)
 libc_hidden_proto(svc_register)
diff --git a/libc/inet/rpc/svc_tcp.c b/libc/inet/rpc/svc_tcp.c
index 51b3b764b..e04c28f63 100644
--- a/libc/inet/rpc/svc_tcp.c
+++ b/libc/inet/rpc/svc_tcp.c
@@ -61,26 +61,26 @@ static char sccsid[] = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
 
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(socket)
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(read)
-libc_hidden_proto(write)
-libc_hidden_proto(perror)
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
+/* libc_hidden_proto(perror) */
 libc_hidden_proto(xdrrec_create)
 libc_hidden_proto(xdrrec_endofrecord)
 libc_hidden_proto(xdrrec_skiprecord)
 libc_hidden_proto(xdrrec_eof)
 libc_hidden_proto(xdr_callmsg)
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 libc_hidden_proto(xprt_register)
 libc_hidden_proto(xprt_unregister)
 libc_hidden_proto(getsockname)
 libc_hidden_proto(bind)
 libc_hidden_proto(bindresvport)
-libc_hidden_proto(poll)
+/* libc_hidden_proto(poll) */
 libc_hidden_proto(accept)
 libc_hidden_proto(listen)
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 /* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(abort) */
 
diff --git a/libc/inet/rpc/svc_udp.c b/libc/inet/rpc/svc_udp.c
index 0e008868b..733ec3f33 100644
--- a/libc/inet/rpc/svc_udp.c
+++ b/libc/inet/rpc/svc_udp.c
@@ -57,20 +57,20 @@ static char sccsid[] = "@(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";
 # include <wchar.h>
 # include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 /* Experimentally off - libc_hidden_proto(memcmp) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(perror)
-libc_hidden_proto(socket)
+/* libc_hidden_proto(perror) */
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
 libc_hidden_proto(xprt_register)
 libc_hidden_proto(xprt_unregister)
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(xdrmem_create) */
 libc_hidden_proto(xdr_callmsg)
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 libc_hidden_proto(getsockname)
 libc_hidden_proto(setsockopt)
 libc_hidden_proto(bind)
@@ -79,7 +79,7 @@ libc_hidden_proto(recvfrom)
 libc_hidden_proto(sendto)
 libc_hidden_proto(recvmsg)
 libc_hidden_proto(sendmsg)
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 /* libc_hidden_proto(fprintf) */
 
 #define rpc_buffer(xprt) ((xprt)->xp_p1)
diff --git a/libc/inet/rpc/svc_unix.c b/libc/inet/rpc/svc_unix.c
index 48fba8977..03c4336d1 100644
--- a/libc/inet/rpc/svc_unix.c
+++ b/libc/inet/rpc/svc_unix.c
@@ -58,16 +58,16 @@
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(socket)
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(perror)
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(perror) */
+/* libc_hidden_proto(getpid) */
 libc_hidden_proto(xdrrec_create)
 libc_hidden_proto(xdrrec_endofrecord)
 libc_hidden_proto(xdrrec_skiprecord)
 libc_hidden_proto(xdrrec_eof)
 libc_hidden_proto(xdr_callmsg)
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 libc_hidden_proto(xprt_register)
 libc_hidden_proto(xprt_unregister)
 libc_hidden_proto(getegid)
@@ -77,10 +77,10 @@ libc_hidden_proto(setsockopt)
 libc_hidden_proto(bind)
 libc_hidden_proto(recvmsg)
 libc_hidden_proto(sendmsg)
-libc_hidden_proto(poll)
+/* libc_hidden_proto(poll) */
 libc_hidden_proto(accept)
 libc_hidden_proto(listen)
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 /* libc_hidden_proto(abort) */
 
 /*
diff --git a/libc/inet/rpc/xdr.c b/libc/inet/rpc/xdr.c
index 54e716176..335702c0f 100644
--- a/libc/inet/rpc/xdr.c
+++ b/libc/inet/rpc/xdr.c
@@ -53,11 +53,11 @@ static char sccsid[] = "@(#)xdr.c 1.35 87/08/12";
 
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 
 /*
  * constants specific to the xdr "protocol"
diff --git a/libc/inet/rpc/xdr_array.c b/libc/inet/rpc/xdr_array.c
index a2299b683..f8f8a1f86 100644
--- a/libc/inet/rpc/xdr_array.c
+++ b/libc/inet/rpc/xdr_array.c
@@ -51,11 +51,11 @@ static char sccsid[] = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 libc_hidden_proto(xdr_u_int)
 
 #define LASTUNSIGNED	((u_int)0-1)
diff --git a/libc/inet/rpc/xdr_mem.c b/libc/inet/rpc/xdr_mem.c
index b7410c404..451751e45 100644
--- a/libc/inet/rpc/xdr_mem.c
+++ b/libc/inet/rpc/xdr_mem.c
@@ -74,7 +74,7 @@ static const struct xdr_ops xdrmem_ops =
  * The procedure xdrmem_create initializes a stream descriptor for a
  * memory buffer.
  */
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(xdrmem_create) */
 void
 xdrmem_create (XDR *xdrs, const caddr_t addr, u_int size, enum xdr_op op)
 {
diff --git a/libc/inet/rpc/xdr_rec.c b/libc/inet/rpc/xdr_rec.c
index ac331c4d3..38349f4ad 100644
--- a/libc/inet/rpc/xdr_rec.c
+++ b/libc/inet/rpc/xdr_rec.c
@@ -57,12 +57,12 @@
 # include <wchar.h>
 # include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(fputs)
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(fputs) */
+/* libc_hidden_proto(lseek) */
 
 static bool_t xdrrec_getlong (XDR *, long *);
 static bool_t xdrrec_putlong (XDR *, const long *);
diff --git a/libc/inet/rpc/xdr_reference.c b/libc/inet/rpc/xdr_reference.c
index 6282f9cb1..dd8c063ba 100644
--- a/libc/inet/rpc/xdr_reference.c
+++ b/libc/inet/rpc/xdr_reference.c
@@ -52,12 +52,12 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
 # include <wchar.h>
 # include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 /* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(xdr_bool)
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 
 #define LASTUNSIGNED	((u_int)0-1)
 
diff --git a/libc/inet/socketcalls.c b/libc/inet/socketcalls.c
index e57c0456d..e262e03f8 100644
--- a/libc/inet/socketcalls.c
+++ b/libc/inet/socketcalls.c
@@ -358,7 +358,7 @@ int shutdown(int sockfd, int how)
 #endif
 
 #ifdef L_socket
-libc_hidden_proto(socket)
+/* libc_hidden_proto(socket) */
 #ifdef __NR_socket
 _syscall3(int, socket, int, family, int, type, int, protocol)
 #elif defined(__NR_socketcall)