Last portion of libc_hidden_proto removal.

Appears to build fine (several .configs tried)

60 files changed, 405 insertions, 404 deletions

diff --git a/libc/inet/addr.c b/libc/inet/addr.c
index ad9539e82..b371fa9ae 100644
--- a/libc/inet/addr.c
+++ b/libc/inet/addr.c
@@ -48,7 +48,7 @@
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
 /* libc_hidden_proto(__ctype_b) */
 #endif
-libc_hidden_proto(inet_aton)
+/* libc_hidden_proto(inet_aton) */
 int inet_aton(const char *cp, struct in_addr *addrptr)
 {
 	in_addr_t addr;
@@ -103,9 +103,9 @@ libc_hidden_def(inet_aton)
 #endif
 
 #ifdef L_inet_addr
-libc_hidden_proto(inet_aton)
+/* libc_hidden_proto(inet_aton) */
 
-libc_hidden_proto(inet_addr)
+/* libc_hidden_proto(inet_addr) */
 in_addr_t inet_addr(const char *cp)
 {
 	struct in_addr a;
@@ -122,7 +122,7 @@ libc_hidden_def(inet_addr)
 
 #define INET_NTOA_MAX_LEN	16	/* max 12 digits + 3 '.'s + 1 nul */
 
-libc_hidden_proto(inet_ntoa_r)
+/* libc_hidden_proto(inet_ntoa_r) */
 char *inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN])
 {
 	in_addr_t addr = ntohl(in.s_addr);
@@ -144,7 +144,7 @@ char *inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN])
 }
 libc_hidden_def(inet_ntoa_r)
 
-libc_hidden_proto(inet_ntoa)
+/* libc_hidden_proto(inet_ntoa) */
 char *inet_ntoa(struct in_addr in)
 {
 	static char buf[INET_NTOA_MAX_LEN];
@@ -162,7 +162,7 @@ libc_hidden_def(inet_ntoa)
  * Formulate an Internet address from network + host.  Used in
  * building addresses stored in the ifnet structure.
  */
-libc_hidden_proto(inet_makeaddr)
+/* libc_hidden_proto(inet_makeaddr) */
 struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host)
 {
 	in_addr_t addr;
@@ -206,7 +206,7 @@ in_addr_t inet_lnaof(struct in_addr in)
  * Return the network number from an internet
  * address; handles class a/b/c network #'s.
  */
-libc_hidden_proto(inet_netof)
+/* libc_hidden_proto(inet_netof) */
 in_addr_t
 inet_netof(struct in_addr in)
 {
diff --git a/libc/inet/ether_addr.c b/libc/inet/ether_addr.c
index 8ce61d241..82b067157 100644
--- a/libc/inet/ether_addr.c
+++ b/libc/inet/ether_addr.c
@@ -31,7 +31,7 @@
 #include <netinet/ether.h>
 #include <netinet/if_ether.h>
 
-libc_hidden_proto(ether_ntoa_r)
+/* libc_hidden_proto(ether_ntoa_r) */
 /* libc_hidden_proto(sprintf) */
 #ifdef __UCLIBC_HAS_XLOCALE__
 /* libc_hidden_proto(__ctype_b_loc) */
diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c
index 189d52f1a..41abbe2de 100644
--- a/libc/inet/getaddrinfo.c
+++ b/libc/inet/getaddrinfo.c
@@ -79,17 +79,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(getservbyname_r)
-libc_hidden_proto(gethostbyname2_r)
-libc_hidden_proto(gethostbyaddr_r)
-libc_hidden_proto(inet_pton)
-libc_hidden_proto(inet_ntop)
-libc_hidden_proto(strtoul)
-libc_hidden_proto(if_nametoindex)
-libc_hidden_proto(__h_errno_location)
+/* libc_hidden_proto(getservbyname_r) */
+/* libc_hidden_proto(gethostbyname2_r) */
+/* libc_hidden_proto(gethostbyaddr_r) */
+/* libc_hidden_proto(inet_pton) */
+/* libc_hidden_proto(inet_ntop) */
+/* libc_hidden_proto(strtoul) */
+/* libc_hidden_proto(if_nametoindex) */
+/* libc_hidden_proto(__h_errno_location) */
 /* libc_hidden_proto(uname) */
 #ifdef __UCLIBC_HAS_IPV6__
-libc_hidden_proto(in6addr_loopback)
+/* libc_hidden_proto(in6addr_loopback) */
 #endif
 
 #define GAIH_OKIFUNSPEC 0x0100
@@ -775,7 +775,7 @@ static const struct gaih gaih[] = {
 	{ PF_UNSPEC, NULL }
 };
 
-libc_hidden_proto(freeaddrinfo)
+/* libc_hidden_proto(freeaddrinfo) */
 void
 freeaddrinfo(struct addrinfo *ai)
 {
@@ -789,7 +789,7 @@ freeaddrinfo(struct addrinfo *ai)
 }
 libc_hidden_def(freeaddrinfo)
 
-libc_hidden_proto(getaddrinfo)
+/* libc_hidden_proto(getaddrinfo) */
 int
 getaddrinfo(const char *name, const char *service,
 	     const struct addrinfo *hints, struct addrinfo **pai)
diff --git a/libc/inet/getnetbyad.c b/libc/inet/getnetbyad.c
index c916a18cf..735005a62 100644
--- a/libc/inet/getnetbyad.c
+++ b/libc/inet/getnetbyad.c
@@ -20,9 +20,9 @@
 #include <netdb.h>
 #include <unistd.h>
 
-libc_hidden_proto(setnetent)
-libc_hidden_proto(getnetent)
-libc_hidden_proto(endnetent)
+/* libc_hidden_proto(setnetent) */
+/* libc_hidden_proto(getnetent) */
+/* libc_hidden_proto(endnetent) */
 
 extern smallint _net_stayopen attribute_hidden;
 
diff --git a/libc/inet/getnetbynm.c b/libc/inet/getnetbynm.c
index 9f3655121..d3f283106 100644
--- a/libc/inet/getnetbynm.c
+++ b/libc/inet/getnetbynm.c
@@ -22,9 +22,9 @@
 #include <unistd.h>
 
 /* Experimentally off - libc_hidden_proto(strcmp) */
-libc_hidden_proto(setnetent)
-libc_hidden_proto(getnetent)
-libc_hidden_proto(endnetent)
+/* libc_hidden_proto(setnetent) */
+/* libc_hidden_proto(getnetent) */
+/* libc_hidden_proto(endnetent) */
 
 extern smallint _net_stayopen attribute_hidden;
 
diff --git a/libc/inet/getnetent.c b/libc/inet/getnetent.c
index 4f164237c..746f8b704 100644
--- a/libc/inet/getnetent.c
+++ b/libc/inet/getnetent.c
@@ -25,8 +25,8 @@
 
 /* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
-libc_hidden_proto(inet_network)
-libc_hidden_proto(rewind)
+/* libc_hidden_proto(inet_network) */
+/* libc_hidden_proto(rewind) */
 /* libc_hidden_proto(fgets) */
 /* libc_hidden_proto(abort) */
 
@@ -44,7 +44,7 @@ static char *net_aliases[MAXALIASES];
 
 smallint _net_stayopen attribute_hidden;
 
-libc_hidden_proto(setnetent)
+/* libc_hidden_proto(setnetent) */
 void setnetent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -58,7 +58,7 @@ void setnetent(int f)
 }
 libc_hidden_def(setnetent)
 
-libc_hidden_proto(endnetent)
+/* libc_hidden_proto(endnetent) */
 void endnetent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -84,7 +84,7 @@ static char * any(register char *cp, char *match)
     return ((char *)0);
 }
 
-libc_hidden_proto(getnetent)
+/* libc_hidden_proto(getnetent) */
 struct netent *getnetent(void)
 {
     char *p;
diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c
index bfaf4917f..837f1315f 100644
--- a/libc/inet/getproto.c
+++ b/libc/inet/getproto.c
@@ -65,8 +65,8 @@
 /* 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(atoi) */
+/* libc_hidden_proto(rewind) */
 /* libc_hidden_proto(fgets) */
 /* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(abort) */
@@ -93,7 +93,7 @@ static void __initbuf(void)
     }
 }
 
-libc_hidden_proto(setprotoent)
+/* libc_hidden_proto(setprotoent) */
 void setprotoent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -106,7 +106,7 @@ void setprotoent(int f)
 }
 libc_hidden_def(setprotoent)
 
-libc_hidden_proto(endprotoent)
+/* libc_hidden_proto(endprotoent) */
 void endprotoent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -119,7 +119,7 @@ void endprotoent(void)
 }
 libc_hidden_def(endprotoent)
 
-libc_hidden_proto(getprotoent_r)
+/* libc_hidden_proto(getprotoent_r) */
 int getprotoent_r(struct protoent *result_buf,
 		  char *buf, size_t buflen,
 		  struct protoent **result)
@@ -210,7 +210,7 @@ struct protoent * getprotoent(void)
 }
 
 
-libc_hidden_proto(getprotobyname_r)
+/* libc_hidden_proto(getprotobyname_r) */
 int getprotobyname_r(const char *name,
 		    struct protoent *result_buf,
 		    char *buf, size_t buflen,
@@ -247,7 +247,7 @@ struct protoent * getprotobyname(const char *name)
 }
 
 
-libc_hidden_proto(getprotobynumber_r)
+/* libc_hidden_proto(getprotobynumber_r) */
 int getprotobynumber_r (int proto_num,
 			struct protoent *result_buf,
 			char *buf, size_t buflen,
diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c
index d427adff9..904f0b79c 100644
--- a/libc/inet/getservice.c
+++ b/libc/inet/getservice.c
@@ -68,8 +68,8 @@
 /* Experimentally off - libc_hidden_proto(strpbrk) */
 /* 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) */
 /* libc_hidden_proto(abort) */
 
@@ -96,7 +96,7 @@ static void __initbuf(void)
     }
 }
 
-libc_hidden_proto(setservent)
+/* libc_hidden_proto(setservent) */
 void setservent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -109,7 +109,7 @@ void setservent(int f)
 }
 libc_hidden_def(setservent)
 
-libc_hidden_proto(endservent)
+/* libc_hidden_proto(endservent) */
 void endservent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -122,7 +122,7 @@ void endservent(void)
 }
 libc_hidden_def(endservent)
 
-libc_hidden_proto(getservent_r)
+/* libc_hidden_proto(getservent_r) */
 int getservent_r(struct servent * result_buf,
 		 char * buf, size_t buflen,
 		 struct servent ** result)
@@ -213,7 +213,7 @@ struct servent * getservent(void)
     return result;
 }
 
-libc_hidden_proto(getservbyname_r)
+/* libc_hidden_proto(getservbyname_r) */
 int getservbyname_r(const char *name, const char *proto,
 	struct servent * result_buf, char * buf, size_t buflen,
 	struct servent ** result)
@@ -251,7 +251,7 @@ struct servent *getservbyname(const char *name, const char *proto)
 }
 
 
-libc_hidden_proto(getservbyport_r)
+/* libc_hidden_proto(getservbyport_r) */
 int getservbyport_r(int port, const char *proto,
 	struct servent * result_buf, char * buf,
 	size_t buflen, struct servent ** result)
@@ -273,7 +273,7 @@ int getservbyport_r(int port, const char *proto,
 }
 libc_hidden_def(getservbyport_r)
 
-libc_hidden_proto(getservbyport)
+/* libc_hidden_proto(getservbyport) */
 struct servent * getservbyport(int port, const char *proto)
 {
     struct servent *result;
diff --git a/libc/inet/herror.c b/libc/inet/herror.c
index 2c671e9e2..8f993a78c 100644
--- a/libc/inet/herror.c
+++ b/libc/inet/herror.c
@@ -24,7 +24,7 @@
 #include <netdb.h>
 
 /* libc_hidden_proto(fprintf) */
-libc_hidden_proto(__h_errno_location)
+/* libc_hidden_proto(__h_errno_location) */
 
 static const char error_msg[] = "Resolver error";
 static const char *const h_errlist[] = {
@@ -39,7 +39,7 @@ static const int h_nerr = { sizeof(h_errlist)/sizeof(h_errlist[0]) };
 /*
  * herror -- print the error indicated by the h_errno value.
  */
-libc_hidden_proto(herror)
+/* libc_hidden_proto(herror) */
 void herror(const char *s)
 {
 	static const char colon_space[] = ": ";
diff --git a/libc/inet/hostid.c b/libc/inet/hostid.c
index e4c592b86..42ee53fbd 100644
--- a/libc/inet/hostid.c
+++ b/libc/inet/hostid.c
@@ -20,10 +20,10 @@
 /* libc_hidden_proto(close) */
 /* libc_hidden_proto(read) */
 /* libc_hidden_proto(write) */
-libc_hidden_proto(getuid)
-libc_hidden_proto(geteuid)
-libc_hidden_proto(gethostbyname_r)
-libc_hidden_proto(gethostname)
+/* libc_hidden_proto(getuid) */
+/* libc_hidden_proto(geteuid) */
+/* libc_hidden_proto(gethostbyname_r) */
+/* libc_hidden_proto(gethostname) */
 
 #define HOSTID "/etc/hostid"
 
diff --git a/libc/inet/if_index.c b/libc/inet/if_index.c
index a5b073091..4100bbf17 100644
--- a/libc/inet/if_index.c
+++ b/libc/inet/if_index.c
@@ -45,7 +45,7 @@
 
 extern int __opensock(void) attribute_hidden;
 
-libc_hidden_proto(if_nametoindex)
+/* libc_hidden_proto(if_nametoindex) */
 unsigned int
 if_nametoindex(const char* ifname)
 {
@@ -75,7 +75,7 @@ if_nametoindex(const char* ifname)
 }
 libc_hidden_def(if_nametoindex)
 
-libc_hidden_proto(if_freenameindex)
+/* libc_hidden_proto(if_freenameindex) */
 void
 if_freenameindex (struct if_nameindex *ifn)
 {
@@ -89,7 +89,7 @@ if_freenameindex (struct if_nameindex *ifn)
 }
 libc_hidden_def(if_freenameindex)
 
-libc_hidden_proto(if_nameindex)
+/* libc_hidden_proto(if_nameindex) */
 #if !__ASSUME_NETLINK_SUPPORT
 struct if_nameindex *
 if_nameindex (void)
diff --git a/libc/inet/ifaddrs.c b/libc/inet/ifaddrs.c
index bdacd62df..3afc6b923 100644
--- a/libc/inet/ifaddrs.c
+++ b/libc/inet/ifaddrs.c
@@ -42,12 +42,12 @@
 /* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
 /* Experimentally off - libc_hidden_proto(time) */
-libc_hidden_proto(sendto)
-libc_hidden_proto(recvmsg)
-libc_hidden_proto(bind)
+/* libc_hidden_proto(sendto) */
+/* libc_hidden_proto(recvmsg) */
+/* libc_hidden_proto(bind) */
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(mempcpy) */
-libc_hidden_proto(getsockname)
+/* libc_hidden_proto(getsockname) */
 /* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(abort) */
 
diff --git a/libc/inet/in6_addr.c b/libc/inet/in6_addr.c
index c2ab375e6..eb096f9e3 100644
--- a/libc/inet/in6_addr.c
+++ b/libc/inet/in6_addr.c
@@ -24,7 +24,7 @@
 #ifdef __UCLIBC_HAS_IPV6__
 const struct in6_addr in6addr_any =
 { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
-libc_hidden_proto(in6addr_loopback)
+/* libc_hidden_proto(in6addr_loopback) */
 const struct in6_addr in6addr_loopback =
 { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } };
 libc_hidden_data_def(in6addr_loopback)
diff --git a/libc/inet/inet_net.c b/libc/inet/inet_net.c
index 93457e7ae..477d67dc9 100644
--- a/libc/inet/inet_net.c
+++ b/libc/inet/inet_net.c
@@ -49,7 +49,7 @@
  * The library routines call this routine to interpret
  * network numbers.
  */
-libc_hidden_proto(inet_network)
+/* libc_hidden_proto(inet_network) */
 in_addr_t
 inet_network(const char *cp)
 {
diff --git a/libc/inet/ntop.c b/libc/inet/ntop.c
index e24ac8de1..dbc71815a 100644
--- a/libc/inet/ntop.c
+++ b/libc/inet/ntop.c
@@ -358,7 +358,7 @@ inet_pton6(const char *src, u_char *dst)
  * author:
  *	Paul Vixie, 1996.
  */
-libc_hidden_proto(inet_ntop)
+/* libc_hidden_proto(inet_ntop) */
 const char *
 inet_ntop(int af, const void *src, char *dst, socklen_t size)
 {
@@ -389,7 +389,7 @@ libc_hidden_def(inet_ntop)
  * author:
  *	Paul Vixie, 1996.
  */
-libc_hidden_proto(inet_pton)
+/* libc_hidden_proto(inet_pton) */
 int
 inet_pton(int af, const char *src, void *dst)
 {
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index 901a7d828..d421aae4b 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -181,44 +181,45 @@
 /* libc_hidden_proto(close) */
 /* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
-libc_hidden_proto(random)
-libc_hidden_proto(getservbyport)
-libc_hidden_proto(gethostname)
-libc_hidden_proto(uname)
-libc_hidden_proto(inet_addr)
-libc_hidden_proto(inet_aton)
-libc_hidden_proto(inet_pton)
-libc_hidden_proto(inet_ntop)
-libc_hidden_proto(connect)
+/* libc_hidden_proto(random) */
+/* libc_hidden_proto(getservbyport) */
+/* libc_hidden_proto(gethostname) */
+/* libc_hidden_proto(uname) */
+/* libc_hidden_proto(inet_addr) */
+/* 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(select)
-libc_hidden_proto(recv)
-libc_hidden_proto(send)
+/* libc_hidden_proto(select) */
+/* libc_hidden_proto(recv) */
+/* libc_hidden_proto(send) */
 /* libc_hidden_proto(printf) */
 /* libc_hidden_proto(sprintf) */
-libc_hidden_proto(snprintf)
+/* libc_hidden_proto(snprintf) */
 /* libc_hidden_proto(fgets) */
-libc_hidden_proto(getnameinfo)
-libc_hidden_proto(gethostbyname)
-libc_hidden_proto(gethostbyname_r)
-libc_hidden_proto(gethostbyname2_r)
-libc_hidden_proto(gethostbyaddr)
-libc_hidden_proto(gethostbyaddr_r)
-libc_hidden_proto(ns_name_uncompress)
-libc_hidden_proto(ns_name_unpack)
-libc_hidden_proto(ns_name_ntop)
-libc_hidden_proto(res_init)
-libc_hidden_proto(res_query)
-libc_hidden_proto(res_querydomain)
-libc_hidden_proto(gethostent_r)
+/* libc_hidden_proto(getnameinfo) */
+/* libc_hidden_proto(gethostbyname) */
+/* libc_hidden_proto(gethostbyname_r) */
+/* libc_hidden_proto(gethostbyname2_r) */
+/* libc_hidden_proto(gethostbyaddr) */
+/* libc_hidden_proto(gethostbyaddr_r) */
+/* libc_hidden_proto(ns_name_uncompress) */
+/* libc_hidden_proto(ns_name_unpack) */
+/* libc_hidden_proto(ns_name_ntop) */
+/* libc_hidden_proto(res_init) */
+/* libc_hidden_proto(res_query) */
+/* libc_hidden_proto(res_querydomain) */
+/* libc_hidden_proto(gethostent_r) */
 /* libc_hidden_proto(fprintf) */
-libc_hidden_proto(__h_errno_location)
+/* libc_hidden_proto(__h_errno_location) */
 #ifdef __UCLIBC_HAS_XLOCALE__
 /* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
 /* libc_hidden_proto(__ctype_b) */
 #endif
-int __libc_getdomainname(char *name, size_t len);
+
+extern int __libc_getdomainname(char *name, size_t len);
 libc_hidden_proto(__libc_getdomainname)
 
 
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 @@