* include/rpc/key_prot.h: Maek all _internal functions as hidden.

	* include/rpc/auth.h: Mark xdr_des_block_internal and
	xdr_opaque_auth_internal as hidden.

	* sysdeps/unix/sysv/linux/getdents.c: Mark __have_no_getdents64 as
	hidden.

	* include/rpc/xdr.h: Make all _internal functions as hidden.

	* sunrpc/pmap_rmt.c: Declare xdr_rmtcall_args_internal as hidden.

6 files changed, 75 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index b7fe215f23..f13404a203 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2006-05-15  Ulrich Drepper  <drepper@redhat.com>
 
+	* include/rpc/key_prot.h: Maek all _internal functions as hidden.
+
+	* include/rpc/auth.h: Mark xdr_des_block_internal and
+	xdr_opaque_auth_internal as hidden.
+
+	* sysdeps/unix/sysv/linux/getdents.c: Mark __have_no_getdents64 as
+	hidden.
+
+	* include/rpc/xdr.h: Make all _internal functions as hidden.
+
+	* sunrpc/pmap_rmt.c: Declare xdr_rmtcall_args_internal as hidden.
+
 	* misc/getusershell.c (okshells): Don't use static initializers,
 	do it dynamically.
 
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index a5e290b898..bc433b5930 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -22,8 +22,10 @@ DECLARE_NSS_PROTOTYPES (nisplus)
 
 #undef DECLARE_NSS_PROTOTYPES
 
-extern bool_t xdr_des_block_internal (XDR *__xdrs, des_block *__blkp);
-extern bool_t xdr_opaque_auth_internal (XDR *, struct opaque_auth *);
+extern bool_t xdr_des_block_internal (XDR *__xdrs, des_block *__blkp)
+  attribute_hidden;
+extern bool_t xdr_opaque_auth_internal (XDR *, struct opaque_auth *)
+  attribute_hidden;
 
 extern AUTH *authunix_create_internal (char *__machname, __uid_t __uid,
 				       __gid_t __gid, int __len,
diff --git a/include/rpc/key_prot.h b/include/rpc/key_prot.h
index ee30c65d3b..2da5de7f70 100644
--- a/include/rpc/key_prot.h
+++ b/include/rpc/key_prot.h
@@ -1,11 +1,15 @@
 #include <sunrpc/rpc/key_prot.h>
 
-extern bool_t xdr_cryptkeyres_internal (XDR *xdrs, cryptkeyres *objp);
-extern bool_t xdr_keystatus_internal (XDR *, keystatus*);
-extern bool_t xdr_keybuf_internal (XDR *, keybuf);
-extern bool_t xdr_cryptkeyarg_internal (XDR *, cryptkeyarg*);
-extern bool_t xdr_cryptkeyarg2_internal (XDR *, cryptkeyarg2*);
-extern bool_t xdr_key_netstres_internal (XDR *, key_netstres*);
-extern bool_t xdr_key_netstarg_internal (XDR *, key_netstarg*);
-extern bool_t xdr_netnamestr_internal (XDR *, netnamestr*);
-extern bool_t xdr_unixcred_internal (XDR *, unixcred*);
+extern bool_t xdr_cryptkeyres_internal (XDR *xdrs, cryptkeyres *objp)
+  attribute_hidden;
+extern bool_t xdr_keystatus_internal (XDR *, keystatus*) attribute_hidden;
+extern bool_t xdr_keybuf_internal (XDR *, keybuf) attribute_hidden;
+extern bool_t xdr_cryptkeyarg_internal (XDR *, cryptkeyarg*) attribute_hidden;
+extern bool_t xdr_cryptkeyarg2_internal (XDR *, cryptkeyarg2*)
+  attribute_hidden;
+extern bool_t xdr_key_netstres_internal (XDR *, key_netstres*)
+  attribute_hidden;
+extern bool_t xdr_key_netstarg_internal (XDR *, key_netstarg*)
+  attribute_hidden;
+extern bool_t xdr_netnamestr_internal (XDR *, netnamestr*) attribute_hidden;
+extern bool_t xdr_unixcred_internal (XDR *, unixcred*) attribute_hidden;
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index ab43f83dcb..e10d53e3b1 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -1,36 +1,54 @@
 #include <sunrpc/rpc/xdr.h>
 
-extern bool_t xdr_void_internal (void);
-extern bool_t xdr_bool_internal (XDR *__xdrs, bool_t *__bp);
-extern bool_t xdr_u_hyper_internal (XDR *__xdrs, u_quad_t *__ullp);
-extern bool_t xdr_u_long_internal (XDR *__xdrs, u_long *__ulp);
-extern bool_t xdr_u_int_internal (XDR *__xdrs, u_int *__up);
-extern bool_t xdr_u_short_internal (XDR *__xdrs, u_short *__usp);
-extern bool_t xdr_hyper_internal (XDR *__xdrs, quad_t *__ullp);
-extern bool_t xdr_long_internal (XDR *__xdrs, long *__ulp);
-extern bool_t xdr_int_internal (XDR *__xdrs, int *__up);
-extern bool_t xdr_short_internal (XDR *__xdrs, short *__usp);
-extern bool_t xdr_enum_internal (XDR *__xdrs, enum_t *__ep);
+extern bool_t xdr_void_internal (void) attribute_hidden;
+extern bool_t xdr_bool_internal (XDR *__xdrs, bool_t *__bp) attribute_hidden;
+extern bool_t xdr_u_hyper_internal (XDR *__xdrs, u_quad_t *__ullp)
+  attribute_hidden;
+extern bool_t xdr_u_long_internal (XDR *__xdrs, u_long *__ulp)
+  attribute_hidden;
+extern bool_t xdr_u_int_internal (XDR *__xdrs, u_int *__up)
+  attribute_hidden;
+extern bool_t xdr_u_short_internal (XDR *__xdrs, u_short *__usp)
+  attribute_hidden;
+extern bool_t xdr_hyper_internal (XDR *__xdrs, quad_t *__ullp)
+  attribute_hidden;
+extern bool_t xdr_long_internal (XDR *__xdrs, long *__ulp)
+  attribute_hidden;
+extern bool_t xdr_int_internal (XDR *__xdrs, int *__up)
+  attribute_hidden;
+extern bool_t xdr_short_internal (XDR *__xdrs, short *__usp)
+  attribute_hidden;
+extern bool_t xdr_enum_internal (XDR *__xdrs, enum_t *__ep)
+  attribute_hidden;
 extern bool_t xdr_union_internal (XDR *__xdrs, enum_t *__dscmp, char *__unp,
 				  const struct xdr_discrim *choices,
-				  xdrproc_t dfault);
+				  xdrproc_t dfault) attribute_hidden;
 extern bool_t xdr_string_internal (XDR *__xdrs, char **__cpp, u_int __maxsize);
 extern bool_t xdr_array_internal (XDR * _xdrs, caddr_t *__addrp,
 				  u_int *__sizep, u_int __maxsize,
-				  u_int __elsize, xdrproc_t __elproc);
+				  u_int __elsize, xdrproc_t __elproc)
+  attribute_hidden;
 extern bool_t xdr_reference_internal (XDR *__xdrs, caddr_t *__xpp,
-				      u_int __size, xdrproc_t __proc);
+				      u_int __size, xdrproc_t __proc)
+  attribute_hidden;
 extern bool_t xdr_bytes_internal (XDR *xdrs, char **cpp, u_int *sizep,
-				  u_int maxsize);
-extern bool_t xdr_netobj_internal (XDR *__xdrs, struct netobj *__np);
-extern bool_t xdr_opaque_internal (XDR *__xdrs, caddr_t __cp, u_int __cnt);
+				  u_int maxsize) attribute_hidden;
+extern bool_t xdr_netobj_internal (XDR *__xdrs, struct netobj *__np)
+  attribute_hidden;
+extern bool_t xdr_opaque_internal (XDR *__xdrs, caddr_t __cp, u_int __cnt)
+  attribute_hidden;
 extern void xdrrec_create_internal (XDR *__xdrs, u_int __sendsize,
 				    u_int __recvsize, caddr_t __tcp_handle,
 				    int (*__readit) (char *, char *, int),
-				    int (*__writeit) (char *, char *, int));
-extern void xdrmem_create_internal (XDR *, const caddr_t, u_int, enum xdr_op);
-extern bool_t xdrrec_endofrecord_internal (XDR *__xdrs, bool_t __sendnow);
-extern bool_t xdrrec_skiprecord_internal (XDR *__xdrs);
-extern bool_t xdrrec_eof_internal (XDR *__xdrs);
+				    int (*__writeit) (char *, char *, int))
+  attribute_hidden;
+extern void xdrmem_create_internal (XDR *, const caddr_t, u_int, enum xdr_op)
+  attribute_hidden;
+extern bool_t xdrrec_endofrecord_internal (XDR *__xdrs, bool_t __sendnow)
+  attribute_hidden;
+extern bool_t xdrrec_skiprecord_internal (XDR *__xdrs)
+  attribute_hidden;
+extern bool_t xdrrec_eof_internal (XDR *__xdrs)
+  attribute_hidden;
 
 libc_hidden_proto (xdrstdio_create)
diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c
index e068848919..7de7f4147c 100644
--- a/sunrpc/pmap_rmt.c
+++ b/sunrpc/pmap_rmt.c
@@ -62,6 +62,10 @@ extern u_long _create_xid (void);
 
 static const struct timeval timeout = {3, 0};
 
+bool_t xdr_rmtcall_args_internal (XDR *xdrs, struct rmtcallargs *cap)
+  attribute_hidden;
+
+
 /*
  * pmapper remote-call-service interface.
  * This routine is used to call the pmapper remote call service
diff --git a/sysdeps/unix/sysv/linux/getdents.c b/sysdeps/unix/sysv/linux/getdents.c
index 963b40d91d..836cbf3922 100644
--- a/sysdeps/unix/sysv/linux/getdents.c
+++ b/sysdeps/unix/sysv/linux/getdents.c
@@ -39,9 +39,9 @@
 # ifndef __ASSUME_GETDENTS64_SYSCALL
 #  ifndef __GETDENTS
 /* The variable is shared between all *getdents* calls.  */
-int __have_no_getdents64;
+int __have_no_getdents64 attribute_hidden;
 #  else
-extern int __have_no_getdents64;
+extern int __have_no_getdents64 attribute_hidden;
 #  endif
 #  define have_no_getdents64_defined 1
 # endif