From a585ba226b0adfc310a49bb5045c3a3096da3da3 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Tue, 6 Aug 2002 04:30:03 +0000
Subject: * 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.
---
 sunrpc/bindrsvprt.c | 2 +-
 sunrpc/clnt_udp.c   | 2 +-
 sunrpc/netname.c    | 3 +++
 sunrpc/svc_tcp.c    | 2 +-
 sunrpc/svc_udp.c    | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'sunrpc')

diff --git a/sunrpc/bindrsvprt.c b/sunrpc/bindrsvprt.c
index ba3309a..3745187 100644
--- a/sunrpc/bindrsvprt.c
+++ b/sunrpc/bindrsvprt.c
@@ -83,4 +83,4 @@ bindresvport (int sd, struct sockaddr_in *sin)
 
   return res;
 }
-INTDEF (bindresvport)
+libc_hidden_def (bindresvport)
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index 8f6d269..f906173 100644
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -191,7 +191,7 @@ clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version,
 	  goto fooy;
 	}
       /* attempt to bind to prov port */
-      (void) INTUSE(bindresvport) (*sockp, (struct sockaddr_in *) 0);
+      (void) bindresvport (*sockp, (struct sockaddr_in *) 0);
       /* the sockets rpc controls are non-blocking */
       (void) __ioctl (*sockp, FIONBIO, (char *) &dontblock);
 #ifdef IP_RECVERR
diff --git a/sunrpc/netname.c b/sunrpc/netname.c
index 7fae673..9deb6d2 100644
--- a/sunrpc/netname.c
+++ b/sunrpc/netname.c
@@ -115,6 +115,7 @@ host2netname (char netname[MAXNETNAMELEN + 1], const char *host,
   sprintf (netname, "%s.%s@%s", OPSYS, hostname, domainname);
   return 1;
 }
+libc_hidden_def (host2netname)
 
 int
 getnetname (char name[MAXNETNAMELEN + 1])
@@ -129,6 +130,7 @@ getnetname (char name[MAXNETNAMELEN + 1])
     dummy = user2netname (name, uid, NULL);
   return (dummy);
 }
+libc_hidden_def (getnetname)
 
 /* Type of the lookup function for netname2user.  */
 typedef int (*netname2user_function) (const char netname[MAXNETNAMELEN + 1],
@@ -174,6 +176,7 @@ netname2user (const char netname[MAXNETNAMELEN + 1], uid_t * uidp, gid_t * gidp,
 
   return status == NSS_STATUS_SUCCESS;
 }
+libc_hidden_def (netname2user)
 
 int
 netname2host (const char netname[MAXNETNAMELEN + 1], char *hostname,
diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c
index 3c5d6a4..4decfa4 100644
--- a/sunrpc/svc_tcp.c
+++ b/sunrpc/svc_tcp.c
@@ -159,7 +159,7 @@ svctcp_create (int sock, u_int sendsize, u_int recvsize)
     }
   __bzero ((char *) &addr, sizeof (addr));
   addr.sin_family = AF_INET;
-  if (INTUSE(bindresvport) (sock, &addr))
+  if (bindresvport (sock, &addr))
     {
       addr.sin_port = 0;
       (void) __bind (sock, (struct sockaddr *) &addr, len);
diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c
index 669aaeb..0410e9c 100644
--- a/sunrpc/svc_udp.c
+++ b/sunrpc/svc_udp.c
@@ -132,7 +132,7 @@ svcudp_bufcreate (sock, sendsz, recvsz)
     }
   __bzero ((char *) &addr, sizeof (addr));
   addr.sin_family = AF_INET;
-  if (INTUSE(bindresvport) (sock, &addr))
+  if (bindresvport (sock, &addr))
     {
       addr.sin_port = 0;
       (void) __bind (sock, (struct sockaddr *) &addr, len);
-- 
cgit v1.1