Last portion of libc_hidden_proto removal.

Appears to build fine (several .configs tried)

43 files changed, 300 insertions, 300 deletions

diff --git a/libc/inet/rpc/auth_none.c b/libc/inet/rpc/auth_none.c
index 30649f91c..478315b8f 100644
--- a/libc/inet/rpc/auth_none.c
+++ b/libc/inet/rpc/auth_none.c
@@ -40,7 +40,7 @@
 #include "rpc_private.h"
 
 /* libc_hidden_proto(xdrmem_create) */
-libc_hidden_proto(xdr_opaque_auth)
+/* libc_hidden_proto(xdr_opaque_auth) */
 
 #define MAX_MARSHAL_SIZE 20
 
@@ -74,7 +74,7 @@ struct authnone_private_s {
 static struct authnone_private_s *authnone_private;
 #endif
 
-libc_hidden_proto(authnone_create)
+/* libc_hidden_proto(authnone_create) */
 AUTH *
 authnone_create (void)
 {
diff --git a/libc/inet/rpc/auth_unix.c b/libc/inet/rpc/auth_unix.c
index 2364aff68..9f5d8b4d7 100644
--- a/libc/inet/rpc/auth_unix.c
+++ b/libc/inet/rpc/auth_unix.c
@@ -57,14 +57,14 @@
 #endif
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(sysconf)
-libc_hidden_proto(getegid)
-libc_hidden_proto(geteuid)
-libc_hidden_proto(getgroups)
-libc_hidden_proto(gethostname)
+/* libc_hidden_proto(sysconf) */
+/* libc_hidden_proto(getegid) */
+/* libc_hidden_proto(geteuid) */
+/* libc_hidden_proto(getgroups) */
+/* libc_hidden_proto(gethostname) */
 /* libc_hidden_proto(xdrmem_create) */
-libc_hidden_proto(xdr_authunix_parms)
-libc_hidden_proto(xdr_opaque_auth)
+/* libc_hidden_proto(xdr_authunix_parms) */
+/* libc_hidden_proto(xdr_opaque_auth) */
 /* libc_hidden_proto(gettimeofday) */
 /* libc_hidden_proto(fputs) */
 /* libc_hidden_proto(perror) */
@@ -109,7 +109,7 @@ static bool_t marshal_new_auth (AUTH *) internal_function;
  * Create a unix style authenticator.
  * Returns an auth handle with the given stuff in it.
  */
-libc_hidden_proto(authunix_create)
+/* libc_hidden_proto(authunix_create) */
 AUTH *
 authunix_create (char *machname, uid_t uid, gid_t gid, int len,
 		 gid_t *aup_gids)
@@ -182,7 +182,7 @@ libc_hidden_def(authunix_create)
  * Returns an auth handle with parameters determined by doing lots of
  * syscalls.
  */
-libc_hidden_proto(authunix_create_default)
+/* libc_hidden_proto(authunix_create_default) */
 AUTH *
 authunix_create_default (void)
 {
diff --git a/libc/inet/rpc/authunix_prot.c b/libc/inet/rpc/authunix_prot.c
index 62d1cb724..2739e7658 100644
--- a/libc/inet/rpc/authunix_prot.c
+++ b/libc/inet/rpc/authunix_prot.c
@@ -39,17 +39,17 @@
 #include <rpc/auth.h>
 #include <rpc/auth_unix.h>
 
-libc_hidden_proto(xdr_string)
-libc_hidden_proto(xdr_u_int)
-libc_hidden_proto(xdr_array)
-libc_hidden_proto(xdr_u_long)
-libc_hidden_proto(xdr_u_short)
+/* libc_hidden_proto(xdr_string) */
+/* libc_hidden_proto(xdr_u_int) */
+/* libc_hidden_proto(xdr_array) */
+/* libc_hidden_proto(xdr_u_long) */
+/* libc_hidden_proto(xdr_u_short) */
 
 /*
  * XDR for unix authentication parameters.
  * Unfortunately, none of these can be declared const.
  */
-libc_hidden_proto(xdr_authunix_parms)
+/* libc_hidden_proto(xdr_authunix_parms) */
 bool_t
 xdr_authunix_parms (XDR * xdrs, struct authunix_parms *p)
 {
diff --git a/libc/inet/rpc/bindresvport.c b/libc/inet/rpc/bindresvport.c
index 457f1f97f..b9e77f3cd 100644
--- a/libc/inet/rpc/bindresvport.c
+++ b/libc/inet/rpc/bindresvport.c
@@ -41,13 +41,13 @@
 #include <netinet/in.h>
 
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(bind)
+/* libc_hidden_proto(bind) */
 /* libc_hidden_proto(getpid) */
 
 /*
  * Bind a socket to a privileged IP port
  */
-libc_hidden_proto(bindresvport)
+/* libc_hidden_proto(bindresvport) */
 int
 bindresvport (int sd, struct sockaddr_in *sin)
 {
diff --git a/libc/inet/rpc/clnt_generic.c b/libc/inet/rpc/clnt_generic.c
index 54bd0e914..165f42aeb 100644
--- a/libc/inet/rpc/clnt_generic.c
+++ b/libc/inet/rpc/clnt_generic.c
@@ -44,12 +44,12 @@
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
-libc_hidden_proto(clnttcp_create)
-libc_hidden_proto(clntudp_create)
-libc_hidden_proto(clntunix_create)
-libc_hidden_proto(getprotobyname_r)
-libc_hidden_proto(gethostbyname_r)
-libc_hidden_proto(__rpc_thread_createerr)
+/* libc_hidden_proto(clnttcp_create) */
+/* libc_hidden_proto(clntudp_create) */
+/* libc_hidden_proto(clntunix_create) */
+/* libc_hidden_proto(getprotobyname_r) */
+/* libc_hidden_proto(gethostbyname_r) */
+/* libc_hidden_proto(__rpc_thread_createerr) */
 
 /*
  * Generic client creation: takes (hostname, program-number, protocol) and
diff --git a/libc/inet/rpc/clnt_perror.c b/libc/inet/rpc/clnt_perror.c
index e700e4137..201a3a353 100644
--- a/libc/inet/rpc/clnt_perror.c
+++ b/libc/inet/rpc/clnt_perror.c
@@ -54,7 +54,7 @@ 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(__glibc_strerror_r)
+/* libc_hidden_proto(__glibc_strerror_r) */
 /* libc_hidden_proto(fputs) */
 #ifdef USE_IN_LIBIO
 /* libc_hidden_proto(fwprintf) */
@@ -186,7 +186,7 @@ static const struct rpc_errtab rpc_errlist[] =
 /*
  * This interface for use by clntrpc
  */
-libc_hidden_proto(clnt_sperrno)
+/* libc_hidden_proto(clnt_sperrno) */
 char *
 clnt_sperrno (enum clnt_stat stat)
 {
@@ -217,7 +217,7 @@ clnt_perrno (enum clnt_stat num)
 /*
  * Print reply error info
  */
-libc_hidden_proto(clnt_sperror)
+/* libc_hidden_proto(clnt_sperror) */
 char *
 clnt_sperror (CLIENT * rpch, const char *msg)
 {
@@ -303,7 +303,7 @@ clnt_sperror (CLIENT * rpch, const char *msg)
 }
 libc_hidden_def(clnt_sperror)
 
-libc_hidden_proto(clnt_perror)
+/* libc_hidden_proto(clnt_perror) */
 void
 clnt_perror (CLIENT * rpch, const char *msg)
 {
@@ -316,7 +316,7 @@ clnt_perror (CLIENT * rpch, const char *msg)
 }
 libc_hidden_def(clnt_perror)
 
-libc_hidden_proto(clnt_spcreateerror)
+/* libc_hidden_proto(clnt_spcreateerror) */
 char *
 clnt_spcreateerror (const char *msg)
 {
diff --git a/libc/inet/rpc/clnt_raw.c b/libc/inet/rpc/clnt_raw.c
index 9941e0894..91340d85a 100644
--- a/libc/inet/rpc/clnt_raw.c
+++ b/libc/inet/rpc/clnt_raw.c
@@ -49,13 +49,13 @@ static char sccsid[] = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/xdr.h>
 
 /* libc_hidden_proto(perror) */
-libc_hidden_proto(authnone_create)
+/* libc_hidden_proto(authnone_create) */
 /* libc_hidden_proto(xdrmem_create) */
-libc_hidden_proto(xdr_callhdr)
+/* libc_hidden_proto(xdr_callhdr) */
 /* libc_hidden_proto(xdr_replymsg) */
-libc_hidden_proto(xdr_opaque_auth)
-libc_hidden_proto(svc_getreq)
-libc_hidden_proto(_seterr_reply)
+/* libc_hidden_proto(xdr_opaque_auth) */
+/* libc_hidden_proto(svc_getreq) */
+/* libc_hidden_proto(_seterr_reply) */
 
 #define MCALL_MSG_SIZE 24
 
diff --git a/libc/inet/rpc/clnt_simple.c b/libc/inet/rpc/clnt_simple.c
index 52fb756a0..938a4d621 100644
--- a/libc/inet/rpc/clnt_simple.c
+++ b/libc/inet/rpc/clnt_simple.c
@@ -54,8 +54,8 @@ static char sccsid[] = "@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strncpy) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(clntudp_create)
-libc_hidden_proto(gethostbyname_r)
+/* libc_hidden_proto(clntudp_create) */
+/* libc_hidden_proto(gethostbyname_r) */
 
 struct callrpc_private_s
   {
diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c
index 553b11bef..622d44552 100644
--- a/libc/inet/rpc/clnt_tcp.c
+++ b/libc/inet/rpc/clnt_tcp.c
@@ -69,22 +69,22 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
 /* 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(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_opaque_auth)
+/* libc_hidden_proto(xdr_opaque_auth) */
 /* 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(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(__rpc_thread_createerr)
+/* libc_hidden_proto(__rpc_thread_createerr) */
 #ifdef USE_IN_LIBIO
 /* libc_hidden_proto(fwprintf) */
 #endif
@@ -141,7 +141,7 @@ static struct clnt_ops tcp_ops =
  * NB: The rpch->cl_auth is set null authentication.  Caller may wish to set this
  * something more useful.
  */
-libc_hidden_proto(clnttcp_create)
+/* libc_hidden_proto(clnttcp_create) */
 CLIENT *
 clnttcp_create (struct sockaddr_in *raddr, u_long prog, u_long vers,
 		int *sockp, u_int sendsz, u_int recvsz)
diff --git a/libc/inet/rpc/clnt_udp.c b/libc/inet/rpc/clnt_udp.c
index 3763db680..84eb5ed10 100644
--- a/libc/inet/rpc/clnt_udp.c
+++ b/libc/inet/rpc/clnt_udp.c
@@ -67,23 +67,23 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 /* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
 /* CMSG_NXTHDR is using it */
-libc_hidden_proto(__cmsg_nxthdr)
+/* libc_hidden_proto(__cmsg_nxthdr) */
 
-libc_hidden_proto(authnone_create)
+/* libc_hidden_proto(authnone_create) */
 /* libc_hidden_proto(xdrmem_create) */
-libc_hidden_proto(xdr_callhdr)
+/* libc_hidden_proto(xdr_callhdr) */
 /* libc_hidden_proto(xdr_replymsg) */
-libc_hidden_proto(xdr_opaque_auth)
-libc_hidden_proto(pmap_getport)
-libc_hidden_proto(_seterr_reply)
-libc_hidden_proto(setsockopt)
-libc_hidden_proto(bindresvport)
-libc_hidden_proto(recvfrom)
-libc_hidden_proto(sendto)
-libc_hidden_proto(recvmsg)
+/* libc_hidden_proto(xdr_opaque_auth) */
+/* libc_hidden_proto(pmap_getport) */
+/* libc_hidden_proto(_seterr_reply) */
+/* libc_hidden_proto(setsockopt) */
+/* 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(__rpc_thread_createerr)
+/* libc_hidden_proto(__rpc_thread_createerr) */
 
 extern u_long _create_xid (void) attribute_hidden;
 
@@ -144,7 +144,7 @@ struct cu_data
  * sendsz and recvsz are the maximum allowable packet sizes that can be
  * sent and received.
  */
-libc_hidden_proto(clntudp_bufcreate)
+/* libc_hidden_proto(clntudp_bufcreate) */
 CLIENT *
 clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version,
 		   struct timeval wait, int *sockp, u_int sendsz,
@@ -245,7 +245,7 @@ fooy:
 }
 libc_hidden_def(clntudp_bufcreate)
 
-libc_hidden_proto(clntudp_create)
+/* libc_hidden_proto(clntudp_create) */
 CLIENT *
 clntudp_create (struct sockaddr_in *raddr, u_long program, u_long version, struct timeval wait, int *sockp)
 {
diff --git a/libc/inet/rpc/clnt_unix.c b/libc/inet/rpc/clnt_unix.c
index 6de4e63b1..b412ccb7d 100644
--- a/libc/inet/rpc/clnt_unix.c
+++ b/libc/inet/rpc/clnt_unix.c
@@ -68,25 +68,25 @@
 /* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
 /* 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(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_opaque_auth)
+/* libc_hidden_proto(xdr_opaque_auth) */
 /* libc_hidden_proto(xdrmem_create) */
-libc_hidden_proto(xdr_void)
-libc_hidden_proto(getegid)
-libc_hidden_proto(geteuid)
-libc_hidden_proto(_seterr_reply)
-libc_hidden_proto(setsockopt)
-libc_hidden_proto(connect)
-libc_hidden_proto(recvmsg)
-libc_hidden_proto(sendmsg)
+/* libc_hidden_proto(xdr_void) */
+/* libc_hidden_proto(getegid) */
+/* libc_hidden_proto(geteuid) */
+/* libc_hidden_proto(_seterr_reply) */
+/* 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(__rpc_thread_createerr)
+/* libc_hidden_proto(__rpc_thread_createerr) */
 
 extern u_long _create_xid (void) attribute_hidden;
 
@@ -140,7 +140,7 @@ static struct clnt_ops unix_ops =
  * NB: The rpch->cl_auth is set null authentication.  Caller may wish to set this
  * something more useful.
  */
-libc_hidden_proto(clntunix_create)
+/* libc_hidden_proto(clntunix_create) */
 CLIENT *
 clntunix_create (struct sockaddr_un *raddr, u_long prog, u_long vers,
 		 int *sockp, u_int sendsz, u_int recvsz)
diff --git a/libc/inet/rpc/create_xid.c b/libc/inet/rpc/create_xid.c
index b46062657..be24d660c 100644
--- a/libc/inet/rpc/create_xid.c
+++ b/libc/inet/rpc/create_xid.c
@@ -25,8 +25,8 @@
 #include <sys/time.h>
 #include <rpc/rpc.h>
 
-libc_hidden_proto(lrand48_r)
-libc_hidden_proto(srand48_r)
+/* libc_hidden_proto(lrand48_r) */
+/* libc_hidden_proto(srand48_r) */
 /* libc_hidden_proto(gettimeofday) */
 
 /* The RPC code is not threadsafe, but new code should be threadsafe. */
diff --git a/libc/inet/rpc/getrpcent.c b/libc/inet/rpc/getrpcent.c
index 2730a644a..2a98544f1 100644
--- a/libc/inet/rpc/getrpcent.c
+++ b/libc/inet/rpc/getrpcent.c
@@ -51,8 +51,8 @@
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
-libc_hidden_proto(atoi)
-libc_hidden_proto(rewind)
+/* libc_hidden_proto(atoi) */
+/* libc_hidden_proto(rewind) */
 /* libc_hidden_proto(fgets) */
 
 /*
@@ -84,7 +84,7 @@ static struct rpcdata *_rpcdata(void)
 	return d;
 }
 
-libc_hidden_proto(endrpcent)
+/* libc_hidden_proto(endrpcent) */
 void endrpcent(void)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -102,7 +102,7 @@ void endrpcent(void)
 }
 libc_hidden_def(endrpcent)
 
-libc_hidden_proto(setrpcent)
+/* libc_hidden_proto(setrpcent) */
 void setrpcent(int f)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -128,7 +128,7 @@ static struct rpcent *__get_next_rpcent(struct rpcdata *d)
 	return interpret(d);
 }
 
-libc_hidden_proto(getrpcent)
+/* libc_hidden_proto(getrpcent) */
 struct rpcent *getrpcent(void)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -141,7 +141,7 @@ struct rpcent *getrpcent(void)
 }
 libc_hidden_def(getrpcent)
 
-libc_hidden_proto(getrpcbynumber)
+/* libc_hidden_proto(getrpcbynumber) */
 struct rpcent *getrpcbynumber(register int number)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -159,7 +159,7 @@ struct rpcent *getrpcbynumber(register int number)
 }
 libc_hidden_def(getrpcbynumber)
 
-libc_hidden_proto(getrpcbyname)
+/* libc_hidden_proto(getrpcbyname) */
 struct rpcent *getrpcbyname(const char *name)
 {
 	struct rpcent *rpc;
diff --git a/libc/inet/rpc/getrpcport.c b/libc/inet/rpc/getrpcport.c
index 0a57d1da9..d831e6719 100644
--- a/libc/inet/rpc/getrpcport.c
+++ b/libc/inet/rpc/getrpcport.c
@@ -49,8 +49,8 @@ static  char sccsid[] = "@(#)getrpcport.c 1.3 87/08/11 SMI";
 #include <sys/socket.h>
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(pmap_getport)
-libc_hidden_proto(gethostbyname_r)
+/* libc_hidden_proto(pmap_getport) */
+/* libc_hidden_proto(gethostbyname_r) */
 
 int
 getrpcport (const char *host, u_long prognum, u_long versnum, u_int proto)
diff --git a/libc/inet/rpc/pm_getmaps.c b/libc/inet/rpc/pm_getmaps.c
index 1760adf37..bcdbbf4e0 100644
--- a/libc/inet/rpc/pm_getmaps.c
+++ b/libc/inet/rpc/pm_getmaps.c
@@ -48,11 +48,11 @@ static char sccsid[] = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 #include <errno.h>
 #include <unistd.h>
 
-libc_hidden_proto(clnt_perror)
-libc_hidden_proto(clnttcp_create)
-libc_hidden_proto(xdr_pmap)
-libc_hidden_proto(xdr_pmaplist)
-libc_hidden_proto(xdr_void)
+/* libc_hidden_proto(clnt_perror) */
+/* libc_hidden_proto(clnttcp_create) */
+/* libc_hidden_proto(xdr_pmap) */
+/* libc_hidden_proto(xdr_pmaplist) */
+/* libc_hidden_proto(xdr_void) */
 
 /*
  * Get a copy of the current port maps.
diff --git a/libc/inet/rpc/pm_getport.c b/libc/inet/rpc/pm_getport.c
index 327fb9101..fa9780c22 100644
--- a/libc/inet/rpc/pm_getport.c
+++ b/libc/inet/rpc/pm_getport.c
@@ -44,10 +44,10 @@ static char sccsid[] = "@(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
 
-libc_hidden_proto(clntudp_bufcreate)
-libc_hidden_proto(__rpc_thread_createerr)
-libc_hidden_proto(xdr_u_short)
-libc_hidden_proto(xdr_pmap)
+/* libc_hidden_proto(clntudp_bufcreate) */
+/* libc_hidden_proto(__rpc_thread_createerr) */
+/* libc_hidden_proto(xdr_u_short) */
+/* libc_hidden_proto(xdr_pmap) */
 
 static const struct timeval timeout =
 {5, 0};
@@ -59,7 +59,7 @@ static const struct timeval tottimeout =
  * Calls the pmap service remotely to do the lookup.
  * Returns 0 if no map exists.
  */
-libc_hidden_proto(pmap_getport)
+/* libc_hidden_proto(pmap_getport) */
 u_short
 pmap_getport (address, program, version, protocol)
      struct sockaddr_in *address;
diff --git a/libc/inet/rpc/pmap_clnt.c b/libc/inet/rpc/pmap_clnt.c
index d71378068..948d9dc2e 100644
--- a/libc/inet/rpc/pmap_clnt.c
+++ b/libc/inet/rpc/pmap_clnt.c
@@ -53,10 +53,10 @@
 /* libc_hidden_proto(close) */
 /* libc_hidden_proto(perror) */
 /* libc_hidden_proto(exit) */
-libc_hidden_proto(clnt_perror)
-libc_hidden_proto(clntudp_bufcreate)
-libc_hidden_proto(xdr_bool)
-libc_hidden_proto(xdr_pmap)
+/* libc_hidden_proto(clnt_perror) */
+/* libc_hidden_proto(clntudp_bufcreate) */
+/* libc_hidden_proto(xdr_bool) */
+/* libc_hidden_proto(xdr_pmap) */
 
 /*
  * Same as get_myaddress, but we try to use the loopback
@@ -122,7 +122,7 @@ static const struct timeval tottimeout = {60, 0};
  * Set a mapping between program,version and port.
  * Calls the pmap service remotely to do the mapping.
  */
-libc_hidden_proto(pmap_set)
+/* libc_hidden_proto(pmap_set) */
 bool_t
 pmap_set (u_long program, u_long version, int protocol, u_short port)
 {
@@ -159,7 +159,7 @@ libc_hidden_def (pmap_set)
  * Remove the mapping between program,version and port.
  * Calls the pmap service remotely to do the un-mapping.
  */
-libc_hidden_proto(pmap_unset)
+/* libc_hidden_proto(pmap_unset) */
 bool_t
 pmap_unset (u_long program, u_long version)
 {
diff --git a/libc/inet/rpc/pmap_prot.c b/libc/inet/rpc/pmap_prot.c
index 0ae2c88f3..a5c4d166b 100644
--- a/libc/inet/rpc/pmap_prot.c
+++ b/libc/inet/rpc/pmap_prot.c
@@ -42,9 +42,9 @@ static char sccsid[] = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/xdr.h>
 #include <rpc/pmap_prot.h>
 
-libc_hidden_proto(xdr_u_long)
+/* libc_hidden_proto(xdr_u_long) */
 
-libc_hidden_proto(xdr_pmap)
+/* libc_hidden_proto(xdr_pmap) */
 bool_t
 xdr_pmap (xdrs, regs)
      XDR *xdrs;
diff --git a/libc/inet/rpc/pmap_prot2.c b/libc/inet/rpc/pmap_prot2.c
index 5adc4ee2e..21def3c4f 100644
--- a/libc/inet/rpc/pmap_prot2.c
+++ b/libc/inet/rpc/pmap_prot2.c
@@ -42,9 +42,9 @@ static char sccsid[] = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/xdr.h>
 #include <rpc/pmap_prot.h>
 
-libc_hidden_proto(xdr_bool)
-libc_hidden_proto(xdr_reference)
-libc_hidden_proto(xdr_pmap)
+/* libc_hidden_proto(xdr_bool) */
+/* libc_hidden_proto(xdr_reference) */
+/* libc_hidden_proto(xdr_pmap) */
 
 /*
  * What is going on with linked lists? (!)
@@ -84,7 +84,7 @@ libc_hidden_proto(xdr_pmap)
  * the net, yet is the data that the pointer points to which is interesting;
  * this sounds like a job for xdr_reference!
  */
-libc_hidden_proto(xdr_pmaplist)
+/* libc_hidden_proto(xdr_pmaplist) */
 bool_t
 xdr_pmaplist (xdrs, rp)
      XDR *xdrs;
diff --git a/libc/inet/rpc/pmap_rmt.c b/libc/inet/rpc/pmap_rmt.c
index 037b3ede0..a1f8f71a8 100644
--- a/libc/inet/rpc/pmap_rmt.c
+++ b/libc/inet/rpc/pmap_rmt.c
@@ -64,21 +64,21 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 /* libc_hidden_proto(perror) */
 /* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(authunix_create_default)
+/* libc_hidden_proto(authunix_create_default) */
 /* libc_hidden_proto(xdrmem_create) */
-libc_hidden_proto(xdr_callmsg)
+/* libc_hidden_proto(xdr_callmsg) */
 /* libc_hidden_proto(xdr_replymsg) */
-libc_hidden_proto(xdr_reference)
-libc_hidden_proto(xdr_u_long)
-libc_hidden_proto(xdr_void)
-libc_hidden_proto(xdr_rmtcallres)
-libc_hidden_proto(xdr_rmtcall_args)
-libc_hidden_proto(inet_makeaddr)
-libc_hidden_proto(inet_netof)
-libc_hidden_proto(clntudp_create)
-libc_hidden_proto(setsockopt)
-libc_hidden_proto(recvfrom)
-libc_hidden_proto(sendto)
+/* libc_hidden_proto(xdr_reference) */
+/* libc_hidden_proto(xdr_u_long) */
+/* libc_hidden_proto(xdr_void) */
+/* libc_hidden_proto(xdr_rmtcallres) */
+/* libc_hidden_proto(xdr_rmtcall_args) */
+/* libc_hidden_proto(inet_makeaddr) */
+/* libc_hidden_proto(inet_netof) */
+/* libc_hidden_proto(clntudp_create) */
+/* libc_hidden_proto(setsockopt) */
+/* libc_hidden_proto(recvfrom) */
+/* libc_hidden_proto(sendto) */
 /* libc_hidden_proto(poll) */
 /* libc_hidden_proto(fprintf) */
 
diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c
index b8e54b61e..17af69ee5 100644
--- a/libc/inet/rpc/rcmd.c
+++ b/libc/inet/rpc/rcmd.c
@@ -105,32 +105,32 @@ static