Merge from trunk and bring in NPTL changes.

28 files changed, 59 insertions, 59 deletions

diff --git a/libc/inet/Makefile.in b/libc/inet/Makefile.in
index 89374f98d..4fc094340 100644
--- a/libc/inet/Makefile.in
+++ b/libc/inet/Makefile.in
@@ -1,6 +1,5 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
 # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
@@ -24,13 +23,18 @@ CSRC +=	encodeh.c decodeh.c encoded.c decoded.c lengthd.c encodeq.c \
 	res_query.c gethostbyaddr.c read_etc_hosts_r.c get_hosts_byname_r.c \
 	get_hosts_byaddr_r.c gethostbyname2.c getnameinfo.c gethostent.c \
 	gethostbyname_r.c gethostbyname2_r.c gethostbyaddr_r.c \
-	res_comp.c ns_name.c
+	res_comp.c ns_name.c _res_state.c
 
 # multi source socketcalls.c
 CSRC +=	accept.c bind.c connect.c getpeername.c getsockname.c getsockopt.c \
 	listen.c recv.c recvfrom.c recvmsg.c send.c sendmsg.c sendto.c \
 	setsockopt.c shutdown.c socket.c socketpair.c 
 
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
+CSRC := $(filter-out accept.c connect.c recv.c recvfrom.c recvmsg.c send.c \
+	  sendmsg.c sendto.c, $(CSRC))
+endif
+
 INET_DIR := $(top_srcdir)libc/inet
 INET_OUT := $(top_builddir)libc/inet
 
@@ -38,6 +42,8 @@ INET_SRC := $(patsubst %.c,$(INET_DIR)/%.c,$(CSRC))
 INET_OBJ := $(patsubst %.c,$(INET_OUT)/%.o,$(CSRC))
 
 libc-y += $(INET_OBJ)
+libc-a-y += $(INET_OBJ)
+libc-so-y += $(INET_OBJ:.o=.os)
 
 objclean-y += inet_objclean
 
diff --git a/libc/inet/addr.c b/libc/inet/addr.c
index 6434466c4..ba2a022d6 100644
--- a/libc/inet/addr.c
+++ b/libc/inet/addr.c
@@ -1,6 +1,7 @@
 /* Copyright (C) 1995,1996 Robert de Bath <rdebath@cix.compulink.co.uk>
- * This file is part of the Linux-8086 C library and is distributed
- * under the GNU Library General Public License.
+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
 /*
@@ -44,7 +45,7 @@
  */
 #ifdef __UCLIBC_HAS_XLOCALE__
 libc_hidden_proto(__ctype_b_loc)
-#else
+#elif __UCLIBC_HAS_CTYPE_TABLES__
 libc_hidden_proto(__ctype_b)
 #endif
 libc_hidden_proto(inet_aton)
@@ -98,7 +99,6 @@ libc_hidden_def(inet_aton)
 #endif
 
 #ifdef L_inet_addr
-#include <arpa/inet.h>
 libc_hidden_proto(inet_aton)
 
 libc_hidden_proto(inet_addr)
diff --git a/libc/inet/ether_addr.c b/libc/inet/ether_addr.c
index 13414826e..e896e707d 100644
--- a/libc/inet/ether_addr.c
+++ b/libc/inet/ether_addr.c
@@ -37,7 +37,7 @@ libc_hidden_proto(sprintf)
 #ifdef __UCLIBC_HAS_XLOCALE__
 libc_hidden_proto(__ctype_b_loc)
 libc_hidden_proto(__ctype_tolower_loc)
-#else
+#elif __UCLIBC_HAS_CTYPE_TABLES__
 libc_hidden_proto(__ctype_b)
 libc_hidden_proto(__ctype_tolower)
 #endif
diff --git a/libc/inet/herror.c b/libc/inet/herror.c
index 66626c0a8..063f6e93e 100644
--- a/libc/inet/herror.c
+++ b/libc/inet/herror.c
@@ -25,7 +25,6 @@
 
 libc_hidden_proto(fprintf)
 libc_hidden_proto(__h_errno_location)
-libc_hidden_proto(stderr)
 
 static const char *error_msg = "Resolver error";
 static const char *const h_errlist[] = {
diff --git a/libc/inet/hostid.c b/libc/inet/hostid.c
index 48dc55732..bd9f5b52b 100644
--- a/libc/inet/hostid.c
+++ b/libc/inet/hostid.c
@@ -30,6 +30,7 @@ libc_hidden_proto(gethostname)
 
 #define HOSTID "/etc/hostid"
 
+#ifdef __USE_BSD
 int sethostid(long int new_id)
 {
 	int fd;
@@ -49,6 +50,7 @@ int sethostid(long int new_id)
 #endif
 	return ret;
 }
+#endif
 
 long int gethostid(void)
 {
diff --git a/libc/inet/if_index.c b/libc/inet/if_index.c
index 239ed6416..b89051c79 100644
--- a/libc/inet/if_index.c
+++ b/libc/inet/if_index.c
@@ -38,11 +38,13 @@
 
 #include "netlinkaccess.h"
 
-libc_hidden_proto(strndup)
 libc_hidden_proto(strncpy)
 libc_hidden_proto(strdup)
 libc_hidden_proto(ioctl)
 libc_hidden_proto(close)
+#if __ASSUME_NETLINK_SUPPORT
+libc_hidden_proto(strndup)
+#endif
 
 extern int __opensock(void) attribute_hidden;
 
diff --git a/libc/inet/inet_net.c b/libc/inet/inet_net.c
index 64c6c3e84..f8148c274 100644
--- a/libc/inet/inet_net.c
+++ b/libc/inet/inet_net.c
@@ -39,7 +39,7 @@
 #include <arpa/inet.h>
 #ifdef __UCLIBC_HAS_XLOCALE__
 libc_hidden_proto(__ctype_b_loc)
-#else
+#elif __UCLIBC_HAS_CTYPE_TABLES__
 libc_hidden_proto(__ctype_b)
 #endif
 
diff --git a/libc/inet/ntohl.c b/libc/inet/ntohl.c
index 87a034bf0..dfadf80d8 100644
--- a/libc/inet/ntohl.c
+++ b/libc/inet/ntohl.c
@@ -1,21 +1,9 @@
 /* vi: set sw=4 ts=4:
  * Functions to convert between host and network byte order.
  *
- * Copyright (C) 2003 by Erik Andersen <andersen@uclibc.org>
+ * Copyright (C) 2003-2006 by Erik Andersen <andersen@uclibc.org>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
 #include <stdint.h>
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index edd06b9e9..b09684ce4 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -136,6 +136,7 @@
 #define __FORCE_GLIBC
 #include <features.h>
 #include <string.h>
+#include <strings.h>
 #include <stdio.h>
 #include <signal.h>
 #include <errno.h>
@@ -202,7 +203,7 @@ libc_hidden_proto(fprintf)
 libc_hidden_proto(__h_errno_location)
 #ifdef __UCLIBC_HAS_XLOCALE__
 libc_hidden_proto(__ctype_b_loc)
-#else
+#elif __UCLIBC_HAS_CTYPE_TABLES__
 libc_hidden_proto(__ctype_b)
 #endif
 
@@ -237,7 +238,6 @@ extern char * __searchdomain[MAX_SEARCH] attribute_hidden;
 #ifdef __UCLIBC_HAS_THREADS__
 # include <pthread.h>
 extern pthread_mutex_t __resolv_lock;
-libc_hidden_proto(__resolv_lock)
 #endif
 #define BIGLOCK	__pthread_mutex_lock(&__resolv_lock)
 #define BIGUNLOCK	__pthread_mutex_unlock(&__resolv_lock)
@@ -1022,7 +1022,6 @@ char * __searchdomain[MAX_SEARCH];
 #ifdef __UCLIBC_HAS_THREADS__
 # include <pthread.h>
 pthread_mutex_t __resolv_lock = PTHREAD_MUTEX_INITIALIZER;
-libc_hidden_data_def(__resolv_lock)
 #endif
 
 /*
@@ -1152,7 +1151,7 @@ struct hostent *gethostbyname2(const char *name, int family)
 
 
 #ifdef L_res_init
-int attribute_hidden __res_init_internal(void)
+int res_init(void)
 {
 	__close_nameservers();
 	__open_nameservers();
@@ -1196,7 +1195,7 @@ int attribute_hidden __res_init_internal(void)
 
 	return(0);
 }
-strong_alias(__res_init_internal,res_init)
+libc_hidden_def(res_init)
 
 void res_close( void )
 {
@@ -2306,6 +2305,7 @@ int gethostbyaddr_r (const void *addr, socklen_t len, int type,
 	struct in6_addr	*in6;
 	struct in6_addr	**addr_list6;
 #endif /* __UCLIBC_HAS_IPV6__ */
+	char **alias;
 	unsigned char *packet;
 	struct resolv_answer a;
 	int i;
@@ -2366,6 +2366,12 @@ int gethostbyaddr_r (const void *addr, socklen_t len, int type,
 	buf+=sizeof(*addr_list)*2;
 	buflen-=sizeof(*addr_list)*2;
 
+	if (buflen < sizeof(char *)*(ALIAS_DIM))
+		return ERANGE;
+	alias=(char **)buf;
+	buf+=sizeof(*alias)*(ALIAS_DIM);
+	buflen-=sizeof(*alias)*(ALIAS_DIM);
+
 #ifdef __UCLIBC_HAS_IPV6__
 	if (plen < sizeof(*in6))
 		return ERANGE;
@@ -2414,6 +2420,9 @@ int gethostbyaddr_r (const void *addr, socklen_t len, int type,
 
 	addr_list[1] = 0;
 
+	alias[0] = buf;
+	alias[1] = 0;
+
 	for (;;) {
 
 	BIGLOCK;
@@ -2460,6 +2469,7 @@ int gethostbyaddr_r (const void *addr, socklen_t len, int type,
     		}
 
 			result_buf->h_addr_list = (char **) addr_list;
+			result_buf->h_aliases = alias;
 			break;
 		} else {
 			free(packet);
diff --git a/libc/inet/rpc/Makefile.in b/libc/inet/rpc/Makefile.in
index 0fd12c3e3..c292834a0 100644
--- a/libc/inet/rpc/Makefile.in
+++ b/libc/inet/rpc/Makefile.in
@@ -1,6 +1,5 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
 # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
@@ -33,10 +32,14 @@ INET_RPC_OBJ:=$(patsubst $(INET_RPC_DIR)/%.c,$(INET_RPC_OUT)/%.o,$(INET_RPC_SRC)
 
 libc-static-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OUT)/rpc_thread.o
 libc-shared-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OUT)/rpc_thread.oS
+libc-a-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OUT)/rpc_thread.o
+libc-so-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OUT)/rpc_thread.oS
 
 libc-nomulti-$(UCLIBC_HAS_RPC) += $(INET_RPC_OUT)/rpc_thread.o
 
 libc-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OBJ)
+libc-a-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OBJ)
+libc-so-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OBJ:.o=.os)
 
 objclean-y+=inet_rpc_objclean
 
diff --git a/libc/inet/rpc/auth_unix.c b/libc/inet/rpc/auth_unix.c
index 7644ab276..80b60b56b 100644
--- a/libc/inet/rpc/auth_unix.c
+++ b/libc/inet/rpc/auth_unix.c
@@ -69,7 +69,6 @@ libc_hidden_proto(gettimeofday)
 libc_hidden_proto(fputs)
 libc_hidden_proto(perror)
 libc_hidden_proto(abort)
-libc_hidden_proto(stderr)
 #ifdef USE_IN_LIBIO
 libc_hidden_proto(fwprintf)
 #endif
diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c
index 6d19df31c..23e4ca863 100644
--- a/libc/inet/rpc/clnt_tcp.c
+++ b/libc/inet/rpc/clnt_tcp.c
@@ -85,7 +85,6 @@ libc_hidden_proto(bindresvport)
 libc_hidden_proto(poll)
 libc_hidden_proto(fputs)
 libc_hidden_proto(__rpc_thread_createerr)
-libc_hidden_proto(stderr)
 #ifdef USE_IN_LIBIO
 libc_hidden_proto(fwprintf)
 #endif
diff --git a/libc/inet/rpc/clnt_udp.c b/libc/inet/rpc/clnt_udp.c
index 9b01d2751..9e3444069 100644
--- a/libc/inet/rpc/clnt_udp.c
+++ b/libc/inet/rpc/clnt_udp.c
@@ -84,7 +84,6 @@ libc_hidden_proto(recvmsg)
 libc_hidden_proto(poll)
 libc_hidden_proto(fputs)
 libc_hidden_proto(__rpc_thread_createerr)
-libc_hidden_proto(stderr)
 
 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 c5e949db6..82f994e51 100644
--- a/libc/inet/rpc/clnt_unix.c
+++ b/libc/inet/rpc/clnt_unix.c
@@ -87,7 +87,6 @@ libc_hidden_proto(sendmsg)
 libc_hidden_proto(poll)
 libc_hidden_proto(fputs)
 libc_hidden_proto(__rpc_thread_createerr)
-libc_hidden_proto(stderr)
 
 extern u_long _create_xid (void) attribute_hidden;
 
diff --git a/libc/inet/rpc/pm_getmaps.c b/libc/inet/rpc/pm_getmaps.c
index bd740a0ae..1760adf37 100644
--- a/libc/inet/rpc/pm_getmaps.c
+++ b/libc/inet/rpc/pm_getmaps.c
@@ -62,7 +62,7 @@ struct pmaplist *
 pmap_getmaps (struct sockaddr_in *address)
 {
   struct pmaplist *head = (struct pmaplist *) NULL;
-  int socket = -1;
+  int _socket = -1;
   struct timeval minutetimeout;
   CLIENT *client;
 
@@ -72,7 +72,7 @@ pmap_getmaps (struct sockaddr_in *address)
 
   /* Don't need a reserved port to get ports from the portmapper.  */
   client = clnttcp_create (address, PMAPPROG,
-			   PMAPVERS, &socket, 50, 500);
+			   PMAPVERS, &_socket, 50, 500);
   if (client != (CLIENT *) NULL)
     {
       if (CLNT_CALL (client, PMAPPROC_DUMP, (xdrproc_t)xdr_void, NULL,
@@ -83,7 +83,7 @@ pmap_getmaps (struct sockaddr_in *address)
 	}
       CLNT_DESTROY (client);
     }
-  /* (void)__close(socket); CLNT_DESTROY already closed it */
+  /* (void)__close(_socket); CLNT_DESTROY already closed it */
   address->sin_port = 0;
   return head;
 }
diff --git a/libc/inet/rpc/pm_getport.c b/libc/inet/rpc/pm_getport.c
index 2fca57800..327fb9101 100644
--- a/libc/inet/rpc/pm_getport.c
+++ b/libc/inet/rpc/pm_getport.c
@@ -68,13 +68,13 @@ pmap_getport (address, program, version, protocol)
      u_int protocol;
 {
   u_short port = 0;
-  int socket = -1;
+  int _socket = -1;
   CLIENT *client;
   struct pmap parms;
 
   address->sin_port = htons (PMAPPORT);
   client = clntudp_bufcreate (address, PMAPPROG,
-	      PMAPVERS, timeout, &socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
+	      PMAPVERS, timeout, &_socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
   if (client != (CLIENT *) NULL)
     {
       struct rpc_createerr *ce = &get_rpc_createerr ();
@@ -95,7 +95,7 @@ pmap_getport (address, program, version, protocol)
 	}
       CLNT_DESTROY (client);
     }
-  /* (void)__close(socket); CLNT_DESTROY already closed it */
+  /* (void)__close(_socket); CLNT_DESTROY already closed it */
   address->sin_port = 0;
   return port;
 }
diff --git a/libc/inet/rpc/pmap_rmt.c b/libc/inet/rpc/pmap_rmt.c
index badb6a467..a0aa22985 100644
--- a/libc/inet/rpc/pmap_rmt.c
+++ b/libc/inet/rpc/pmap_rmt.c
@@ -72,6 +72,7 @@ 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)
@@ -139,7 +140,6 @@ pmap_rmtcall (addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, port_p
  * XDR remote call arguments
  * written for XDR_ENCODE direction only
  */
-libc_hidden_proto(xdr_rmtcall_args)
 bool_t
 xdr_rmtcall_args (XDR *xdrs, struct rmtcallargs *cap)
 {
diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c
index b4fe8cfe7..6009d6d31 100644
--- a/libc/inet/rpc/rcmd.c
+++ b/libc/inet/rpc/rcmd.c
@@ -94,7 +94,6 @@ libc_hidden_proto(strcmp)
 libc_hidden_proto(strcpy)
 libc_hidden_proto(strlen)
 libc_hidden_proto(strncmp)
-libc_hidden_proto(strnlen)
 libc_hidden_proto(memmove)
 libc_hidden_proto(getpid)
 libc_hidden_proto(socket)
@@ -132,11 +131,10 @@ libc_hidden_proto(fopen)
 libc_hidden_proto(fclose)
 libc_hidden_proto(fprintf)
 libc_hidden_proto(__h_errno_location)
-libc_hidden_proto(stderr)
 #ifdef __UCLIBC_HAS_XLOCALE__
 libc_hidden_proto(__ctype_b_loc)
 libc_hidden_proto(__ctype_tolower_loc)
-#else
+#elif __UCLIBC_HAS_CTYPE_TABLES__
 libc_hidden_proto(__ctype_b)
 libc_hidden_proto(__ctype_tolower)
 #endif
diff --git a/libc/inet/rpc/rpc_private.h b/libc/inet/rpc/rpc_private.h
index 4826d362b..15250059a 100644
--- a/libc/inet/rpc/rpc_private.h
+++ b/libc/inet/rpc/rpc_private.h
@@ -5,7 +5,6 @@
 extern u_long _create_xid (void) attribute_hidden;
 
 libc_hidden_proto(__rpc_thread_createerr)
-libc_hidden_proto(stderr)
 
 /*
  * Multi-threaded support
diff --git a/libc/inet/rpc/rtime.c b/libc/inet/rpc/rtime.c
index fc4cfe548..6190868ad 100644
--- a/libc/inet/rpc/rtime.c
+++ b/libc/inet/rpc/rtime.c
@@ -1,3 +1,6 @@
+#if 0
+static char sccsid[] = "@(#)rtime.c	2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 SMI";
+#endif
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -26,9 +29,6 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if 0
-static char sccsid[] = "@(#)rtime.c	2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 SMI";
-#endif
 
 /*
  * Copyright (c) 1988 by Sun Microsystems, Inc.
@@ -65,6 +65,7 @@ libc_hidden_proto(connect)
 libc_hidden_proto(recvfrom)
 libc_hidden_proto(sendto)
 libc_hidden_proto(poll)
+libc_hidden_proto(rtime)
 
 #define NYEARS	(u_long)(1970 - 1900)
 #define TOFFSET (u_long)(60*60*24*(365*NYEARS + (NYEARS/4)))
@@ -89,9 +90,10 @@ rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep,
   struct pollfd fd;
   int milliseconds;
   int res;
-  unsigned long thetime;
+  /* RFC 868 says the time is transmitted as a 32-bit value.  */
+  uint32_t thetime;
   struct sockaddr_in from;
-  int fromlen;
+  socklen_t fromlen;
   int type;
 
   if (timeout == NULL)
@@ -108,7 +110,7 @@ rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep,
   if (type == SOCK_DGRAM)
     {
       res = sendto (s, (char *) &thetime, sizeof (thetime), 0,
-		    (struct sockaddr *) addrp, sizeof (*addrp));
+		      (struct sockaddr *) addrp, sizeof (*addrp));
       if (res < 0)
 	{
 	  do_close (s);
@@ -129,7 +131,7 @@ rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep,
 	}
       fromlen = sizeof (from);
       res = recvfrom (s, (char *) &thetime, sizeof (thetime), 0,
-		      (struct sockaddr *) &from, &fromlen);
+			(struct sockaddr *) &from, &fromlen);
       do_close (s);
       if (res < 0)
 	return -1;
@@ -156,3 +158,4 @@ rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep,
   timep->tv_usec = 0;
   return 0;
 }
+libc_hidden_def (rtime)
diff --git a/libc/inet/rpc/ruserpass.c b/libc/inet/rpc/ruserpass.c
index 97f1284b3..0adcbf1d3 100644
--- a/libc/inet/rpc/ruserpass.c
+++ b/libc/inet/rpc/ruserpass.c
@@ -40,6 +40,7 @@
 #include <stdio_ext.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 
 libc_hidden_proto(strcat)
diff --git a/libc/inet/rpc/svc_tcp.c b/libc/inet/rpc/svc_tcp.c
index c94f2de07..035119d7e 100644
--- a/libc/inet/rpc/svc_tcp.c
+++ b/libc/inet/rpc/svc_tcp.c
@@ -83,7 +83,6 @@ libc_hidden_proto(listen)
 libc_hidden_proto(fputs)
 libc_hidden_proto(fclose)
 libc_hidden_proto(abort)
-libc_hidden_proto(stderr)
 
 /*
  * Ops vector for TCP/IP based rpc service handle
diff --git a/libc/inet/rpc/svc_udp.c b/libc/inet/rpc/svc_udp.c
index 53ef7ab35..d2ed68d1b 100644
--- a/libc/inet/rpc/svc_udp.c
+++ b/libc/inet/rpc/svc_udp.c
@@ -81,7 +81,6 @@ libc_hidden_proto(recvmsg)
 libc_hidden_proto(sendmsg)
 libc_hidden_proto(fputs)
 libc_hidden_proto(fprintf)
-libc_hidden_proto(stderr)
 
 #define rpc_buffer(xprt) ((xprt)->xp_p1)
 #ifndef MAX
diff --git a/libc/inet/rpc/svc_unix.c b/libc/inet/rpc/svc_unix.c
index d91a9acbb..1683bd3ba 100644
--- a/libc/inet/rpc/svc_unix.c
+++ b/libc/inet/rpc/svc_unix.c
@@ -82,7 +82,6 @@ libc_hidden_proto(accept)
 libc_hidden_proto(listen)
 libc_hidden_proto(fputs)
 libc_hidden_proto(abort)
-libc_hidden_proto(stderr)
 
 /*
  * Ops vector for AF_UNIX based rpc service handle
diff --git a/libc/inet/rpc/xdr.c b/libc/inet/rpc/xdr.c
index 34787a898..e8009910f 100644
--- a/libc/inet/rpc/xdr.c
+++ b/libc/inet/rpc/xdr.c
@@ -58,7 +58,6 @@ libc_hidden_proto(fwprintf)
 
 libc_hidden_proto(strlen)
 libc_hidden_proto(fputs)
-libc_hidden_proto(stderr)
 
 /*
  * constants specific to the xdr "protocol"
diff --git a/libc/inet/rpc/xdr_array.c b/libc/inet/rpc/xdr_array.c
index ddafc63b7..5f21fb29e 100644
--- a/libc/inet/rpc/xdr_array.c
+++ b/libc/inet/rpc/xdr_array.c
@@ -57,7 +57,6 @@ libc_hidden_proto(fwprintf)
 libc_hidden_proto(memset)
 libc_hidden_proto(fputs)
 libc_hidden_proto(xdr_u_int)
-libc_hidden_proto(stderr)
 
 #define LASTUNSIGNED	((u_int)0-1)
 
diff --git a/libc/inet/rpc/xdr_rec.c b/libc/inet/rpc/xdr_rec.c
index 99e6fe9c3..5f9e2b1fe 100644
--- a/libc/inet/rpc/xdr_rec.c
+++ b/libc/inet/rpc/xdr_rec.c
@@ -63,7 +63,6 @@ libc_hidden_proto(fwprintf)
 libc_hidden_proto(memcpy)
 libc_hidden_proto(fputs)
 libc_hidden_proto(lseek)
-libc_hidden_proto(stderr)
 
 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 842d54426..7201def7a 100644
--- a/libc/inet/rpc/xdr_reference.c
+++ b/libc/inet/rpc/xdr_reference.c
@@ -58,7 +58,6 @@ libc_hidden_proto(fwprintf)
 libc_hidden_proto(memset)
 libc_hidden_proto(xdr_bool)
 libc_hidden_proto(fputs)
-libc_hidden_proto(stderr)
 
 #define LASTUNSIGNED	((u_int)0-1)