* include/rpc/auth.h: Use libc_hidden_proto for getnetname,

	netname2user, host2netname, user2netname, key_gendes.
	* sunrpc/netname.c: Add libc_hidden_def.
	* sunrpc/key_call.c: Likewise.

	* include/netdb.h: Use libc_hidden_proto for getaddrinfo, getnameinfo,
	freeaddrinfo.
	* inet/getnameinfo.c: Add libc_hidden_def.
	* sysdeps/generic/getaddrinfo.c: Likewise.
	* sysdeps/posix/getaddrinfo.c: Likewise.

	* include/wchar.h: Use libc_hidden_proto for wmemchr, wmemset.
	* wcsmbs/wmemchr.c: Add libc_hidden_def.
	* wcsmbs/wmemset.c: Add libc_hidden_def.

	* include/string.h: Move libc_hidden_proto's inside #ifndef _STRING_H.
	(index, rindex): Define as macros for strchr, strrchr.

	* string/envz.c (envz_strip): index -> strchr

	* include/rpc/rpc_msg.h: Use libc_hidden_proto for _seterr_reply.
	* sunrpc/rpc_prot.c: Add libc_hidden_def.

	* include/wchar.h: Use libc_hidden_proto for mbrtowc.
	* wcsmbs/mbrtowc.c: Add libc_hidden_weak.

5 files changed, 20 insertions, 1 deletions

diff --git a/include/netdb.h b/include/netdb.h
index a824404cb3..9b1a1abb9b 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -28,6 +28,10 @@ libc_hidden_proto (rexec_af)
 libc_hidden_proto (rresvport_af)
 libc_hidden_proto (ruserok_af)
 
+libc_hidden_proto (getaddrinfo)
+libc_hidden_proto (getnameinfo)
+libc_hidden_proto (freeaddrinfo)
+
 /* Document internal interfaces.  */
 extern int __gethostent_r (struct hostent *__restrict __result_buf,
 			   char *__restrict __buf, size_t __buflen,
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index 9cef7c6fa9..a5e290b898 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -5,6 +5,7 @@ libc_hidden_proto (getnetname)
 libc_hidden_proto (netname2user)
 libc_hidden_proto (host2netname)
 libc_hidden_proto (user2netname)
+libc_hidden_proto (key_gendes)
 
 /* Now define the internal interfaces.  */
 struct key_netstarg;
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index ab2e775430..3e518c93d4 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -1,6 +1,8 @@
 #ifndef _RPC_MSG_H
 #include <sunrpc/rpc/rpc_msg.h>
 
+libc_hidden_proto (_seterr_reply)
+
 /* Now define the internal interfaces.  */
 
 extern bool_t xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr);
diff --git a/include/string.h b/include/string.h
index 64c59b00fb..b4ccb1b57f 100644
--- a/include/string.h
+++ b/include/string.h
@@ -59,7 +59,6 @@ extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen);
       __new[__len] = '\0';						      \
       (char *) memcpy (__new, __old, __len);				      \
     }))
-#endif
 
 libc_hidden_proto (__mempcpy)
 libc_hidden_proto (__stpcpy)
@@ -72,3 +71,12 @@ libc_hidden_proto (__strdup)
 libc_hidden_proto (__strndup)
 libc_hidden_proto (__strerror_r)
 libc_hidden_proto (__strverscmp)
+
+# ifndef index
+#  define index(s, c)	(strchr ((s), (c)))
+# endif
+# ifndef rindex
+#  define rindex(s, c)	(strrchr ((s), (c)))
+# endif
+
+#endif
diff --git a/include/wchar.h b/include/wchar.h
index 0a5c948610..9094ce12a8 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -19,6 +19,7 @@ libc_hidden_proto (putwc_unlocked)
 
 libc_hidden_proto (vswscanf)
 
+libc_hidden_proto (mbrtowc)
 libc_hidden_proto (wcrtomb)
 libc_hidden_proto (wcscmp)
 libc_hidden_proto (wcsftime)
@@ -27,6 +28,9 @@ libc_hidden_proto (wcschr)
 libc_hidden_proto (wcscoll)
 libc_hidden_proto (wcspbrk)
 
+libc_hidden_proto (wmemchr)
+libc_hidden_proto (wmemset)
+
 /* Now define the internal interfaces.  */
 extern int __wcscasecmp (__const wchar_t *__s1, __const wchar_t *__s2)
      __attribute_pure__;