* sysdeps/posix/system.c (do_system): New function, guts broken out of

	__libc_system.
	(__libc_system): Call it, putting just the line == NULL test here.

	* include/libc-symbols.h (__hidden_proto): Add extern keywords so
	variables work right.

	* elf/dl-open.c (dl_open_worker): Use _ macro instead of gettext.
	* elf/dl-close.c (_dl_close): Likewise.

	* include/netinet/in.h: Use libc_hidden_proto for bindresvport,
	in6addr_any, in6addr_loopback.  Remove decls for
	bindresvport_internal, in6addr_any_internal, in6addr_loopback_internal.
	* sunrpc/svc_udp.c (svcudp_bufcreate): Nix INTUSE for bindresvport.
	* sunrpc/svc_tcp.c (svctcp_create): Likewise.
	* sunrpc/clnt_udp.c (clntudp_bufcreate): Likewise.
	* sunrpc/bindrsvprt.c: Change INTDEF to libc_hidden_def.
	* inet/in6_addr.c: Change INTVARDEF to libc_hidden_def.
	* sysdeps/posix/getaddrinfo.c (gaih_inet): Nix INTUSE for
	in6addr_loopback.
	* inet/gethstbyad_r.c (PREPROCESS): Nix INTUSE for in6addr_any.

	* include/netinet/ether.h: Use libc_hidden_proto for ether_ntoa_r,
	ether_aton_r.
	* inet/ether_aton_r.c: Add libc_hidden_def.
	* inet/ether_ntoa_r.c: Likewise.

	* include/rpc/auth.h: Use libc_hidden_proto for getnetname,
	netname2user, host2netname.
	* sunrpc/netname.c: Add libc_hidden_def.

	* include/netdb.h: Use libc_hidden_proto for innetgr, rcmd_af,
	rexec_af, rresvport_af, ruserok_af.
	* inet/rcmd.c: Add libc_hidden_def.
	* inet/getnetgrent_r.c: Likewise.

5 files changed, 33 insertions, 19 deletions

diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index 0360232..dcc4712 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -450,8 +450,8 @@
 #  endif
 #  define hidden_proto(name) __hidden_proto (name, __GI_##name)
 #  define __hidden_proto(name, internal) \
-  __typeof (name) internal; \
-  __typeof (name) name __asm__ (__hidden_asmname (#internal)) \
+  extern __typeof (name) internal; \
+  extern __typeof (name) name __asm__ (__hidden_asmname (#internal)) \
   __hidden_proto_hiddenattr;
 #  define __hidden_asmname(name) \
   __hidden_asmname1 (__USER_LABEL_PREFIX__, name)
diff --git a/include/netdb.h b/include/netdb.h
index 1f2ab03..a767ca6 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -21,6 +21,12 @@ __set_h_errno (int __err)
 #  define __set_h_errno(x) (h_errno = (x))
 # endif	/* _LIBC_REENTRANT */
 
+libc_hidden_proto (innetgr)
+libc_hidden_proto (rcmd_af)
+libc_hidden_proto (rexec_af)
+libc_hidden_proto (rresvport_af)
+libc_hidden_proto (ruserok_af)
+
 /* Document internal interfaces.  */
 extern int __gethostent_r (struct hostent *__restrict __result_buf,
 			   char *__restrict __buf, size_t __buflen,
diff --git a/include/netinet/ether.h b/include/netinet/ether.h
index 98947aa..bf01654 100644
--- a/include/netinet/ether.h
+++ b/include/netinet/ether.h
@@ -1,6 +1,9 @@
 #ifndef _NETINET_ETHER_H
 #include <inet/netinet/ether.h>
 
+libc_hidden_proto (ether_aton_r)
+libc_hidden_proto (ether_ntoa_r)
+
 /* Because the `ethers' lookup does not fit so well in the scheme we
    define a dummy struct here which helps us to use the available
    functions.  */
@@ -15,18 +18,18 @@ extern int _nss_files_parse_etherent (char *line, struct etherent *result,
 				      struct parser_data *data,
 				      size_t datalen, int *errnop);
 
-#define DECLARE_NSS_PROTOTYPES(service)						\
-extern enum nss_status _nss_ ## service ## _setetherent (int __stayopen);	\
-extern enum nss_status _nss_ ## service ## _endetherent (void);			\
-extern enum nss_status _nss_ ## service ## _getetherent_r			\
-                       (struct etherent *result, char *buffer,			\
-			size_t buflen, int *errnop);				\
-extern enum nss_status _nss_ ## service ## _gethostton_r			\
-                       (const char *name, struct etherent *eth,			\
-			char *buffer, size_t buflen, int *errnop);		\
-extern enum nss_status _nss_ ## service ## _getntohost_r			\
-                       (const struct ether_addr *addr,				\
-			struct etherent *eth,					\
+#define DECLARE_NSS_PROTOTYPES(service)					      \
+extern enum nss_status _nss_ ## service ## _setetherent (int __stayopen);     \
+extern enum nss_status _nss_ ## service ## _endetherent (void);		      \
+extern enum nss_status _nss_ ## service ## _getetherent_r		      \
+                       (struct etherent *result, char *buffer,		      \
+			size_t buflen, int *errnop);			      \
+extern enum nss_status _nss_ ## service ## _gethostton_r		      \
+                       (const char *name, struct etherent *eth,		      \
+			char *buffer, size_t buflen, int *errnop);	      \
+extern enum nss_status _nss_ ## service ## _getntohost_r		      \
+                       (const struct ether_addr *addr,			      \
+			struct etherent *eth,				      \
 			char *buffer, size_t buflen, int *errnop);
 
 DECLARE_NSS_PROTOTYPES (files)
diff --git a/include/netinet/in.h b/include/netinet/in.h
index 356cc96..876f1a4 100644
--- a/include/netinet/in.h
+++ b/include/netinet/in.h
@@ -1,8 +1,9 @@
+#ifndef _NETINET_IN_H
+
 #include <inet/netinet/in.h>
 
-extern const struct in6_addr in6addr_any_internal attribute_hidden;
-extern const struct in6_addr in6addr_loopback_internal attribute_hidden;
+libc_hidden_proto (bindresvport)
+libc_hidden_proto (in6addr_loopback)
+libc_hidden_proto (in6addr_any)
 
-/* Bind socket to a privileged IP port.  */
-extern int bindresvport_internal (int __sockfd,
-				  struct sockaddr_in *__sock_in) attribute_hidden;
+#endif
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index a32f86d..d0a6dd6 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -1,6 +1,10 @@
 #ifndef _RPC_AUTH_H
 #include <sunrpc/rpc/auth.h>
 
+libc_hidden_proto (getnetname)
+libc_hidden_proto (netname2user)
+libc_hidden_proto (host2netname)
+
 /* Now define the internal interfaces.  */
 struct key_netstarg;
 extern int key_setnet (struct key_netstarg *arg);