[src/netbsd-3]: src/lib/libc Pull up following revision(s) (requested by klei...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2cbaa5ab3f74
branches:  netbsd-3
changeset: 577787:2cbaa5ab3f74
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Jan 28 10:23:01 2006 +0000

description:
Pull up following revision(s) (requested by kleink in ticket #1142):
        lib/libc/rpc/mt_misc.c: revision 1.5
        lib/libc/include/namespace.h: revision 1.110
Need to give the various rpc locks private names (prefixing them with
__rpc_).  Rather than scattering changes around the 3rd-party RPC
code, place them in namespace.h.

diffstat:

 lib/libc/include/namespace.h |  24 +++++++++++++++++++++++-
 lib/libc/rpc/mt_misc.c       |   5 +++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diffs (59 lines):

diff -r e6a18dab9918 -r 2cbaa5ab3f74 lib/libc/include/namespace.h
--- a/lib/libc/include/namespace.h      Sat Jan 28 10:21:38 2006 +0000
+++ b/lib/libc/include/namespace.h      Sat Jan 28 10:23:01 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: namespace.h,v 1.98.2.1 2005/07/11 21:22:21 tron Exp $  */
+/*     $NetBSD: namespace.h,v 1.98.2.2 2006/01/28 10:23:01 tron Exp $  */
 
 /*-
  * Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -671,6 +671,28 @@
 #define dlerror                        __dlerror
 #define dladdr                 __dladdr
 #define fmtcheck               __fmtcheck
+
+/* rpc locks */
+#define authdes_lock           __rpc_authdes_lock
+#define authnone_lock          __rpc_authnone_lock
+#define authsvc_lock           __rpc_authsvc_lock
+#define clnt_fd_lock           __rpc_clnt_fd_lock
+#define clntraw_lock           __rpc_clntraw_lock
+#define dname_lock             __rpc_dname_lock
+#define dupreq_lock            __rpc_dupreq_lock
+#define keyserv_lock           __rpc_keyserv_lock
+#define libnsl_trace_lock      __rpc_libnsl_trace_lock
+#define loopnconf_lock         __rpc_loopnconf_lock
+#define ops_lock               __rpc_ops_lock
+#define portnum_lock           __rpc_portnum_lock
+#define proglst_lock           __rpc_proglst_lock
+#define rpcbaddr_cache_lock    __rpc_rpcbaddr_cache_lock
+#define rpcsoc_lock            __rpc_rpcsoc_lock
+#define svc_fd_lock            __rpc_svc_fd_lock
+#define svc_lock               __rpc_svc_lock
+#define svcraw_lock            __rpc_svcraw_lock
+#define xprtlist_lock          __rpc_xprtlist_lock
+
 #define __learn_tree           ___learn_tree
 #endif /* __weak_alias */
 
diff -r e6a18dab9918 -r 2cbaa5ab3f74 lib/libc/rpc/mt_misc.c
--- a/lib/libc/rpc/mt_misc.c    Sat Jan 28 10:21:38 2006 +0000
+++ b/lib/libc/rpc/mt_misc.c    Sat Jan 28 10:23:01 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mt_misc.c,v 1.4 2004/05/28 14:39:07 christos Exp $     */
+/*     $NetBSD: mt_misc.c,v 1.4.2.1 2006/01/28 10:23:01 tron Exp $     */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -45,9 +45,10 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: mt_misc.c,v 1.4 2004/05/28 14:39:07 christos Exp $");
+__RCSID("$NetBSD: mt_misc.c,v 1.4.2.1 2006/01/28 10:23:01 tron Exp $");
 #endif
 
+#include       "namespace.h"
 #include       "reentrant.h"
 #include       <rpc/rpc.h>
 #include       <sys/time.h>