[src/trunk]: src/lib/libc/rpc Use __isthreaded from reentrant.h and don't red...

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

details:   https://anonhg.NetBSD.org/src/rev/e8ade9d95776
branches:  trunk
changeset: 759395:e8ade9d95776
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Dec 08 02:06:38 2010 +0000

description:
Use __isthreaded from reentrant.h and don't redeclare it.

diffstat:

 lib/libc/rpc/clnt_dg.c      |  5 ++---
 lib/libc/rpc/clnt_simple.c  |  5 ++---
 lib/libc/rpc/clnt_vc.c      |  5 ++---
 lib/libc/rpc/getnetconfig.c |  5 ++---
 lib/libc/rpc/mt_misc.c      |  5 ++---
 lib/libc/rpc/rpc_generic.c  |  6 ++----
 lib/libc/rpc/rpc_soc.c      |  9 ++-------
 7 files changed, 14 insertions(+), 26 deletions(-)

diffs (194 lines):

diff -r 5e7618d00af6 -r e8ade9d95776 lib/libc/rpc/clnt_dg.c
--- a/lib/libc/rpc/clnt_dg.c    Wed Dec 08 02:05:39 2010 +0000
+++ b/lib/libc/rpc/clnt_dg.c    Wed Dec 08 02:06:38 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clnt_dg.c,v 1.23 2009/02/12 04:33:20 lukem Exp $       */
+/*     $NetBSD: clnt_dg.c,v 1.24 2010/12/08 02:06:38 joerg Exp $       */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro";
 #else
-__RCSID("$NetBSD: clnt_dg.c,v 1.23 2009/02/12 04:33:20 lukem Exp $");
+__RCSID("$NetBSD: clnt_dg.c,v 1.24 2010/12/08 02:06:38 joerg Exp $");
 #endif
 #endif
 
@@ -99,7 +99,6 @@
  */
 static int     *dg_fd_locks;
 #ifdef _REENTRANT
-extern int __isthreaded;
 #define __rpc_lock_value __isthreaded;
 extern mutex_t clnt_fd_lock;
 static cond_t  *dg_cv;
diff -r 5e7618d00af6 -r e8ade9d95776 lib/libc/rpc/clnt_simple.c
--- a/lib/libc/rpc/clnt_simple.c        Wed Dec 08 02:05:39 2010 +0000
+++ b/lib/libc/rpc/clnt_simple.c        Wed Dec 08 02:06:38 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clnt_simple.c,v 1.29 2006/11/03 23:16:12 christos Exp $        */
+/*     $NetBSD: clnt_simple.c,v 1.30 2010/12/08 02:06:38 joerg Exp $   */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)clnt_simple.c 1.49 89/01/31 Copyr 1984 Sun Micro";
 #else
-__RCSID("$NetBSD: clnt_simple.c,v 1.29 2006/11/03 23:16:12 christos Exp $");
+__RCSID("$NetBSD: clnt_simple.c,v 1.30 2010/12/08 02:06:38 joerg Exp $");
 #endif
 #endif
 
@@ -131,7 +131,6 @@
        struct rpc_call_private *rcp = (struct rpc_call_private *) 0;
        enum clnt_stat clnt_stat;
        struct timeval timeout, tottimeout;
-       extern int __isthreaded;
 
        _DIAGASSERT(host != NULL);
        /* XXX: in may be NULL ??? */
diff -r 5e7618d00af6 -r e8ade9d95776 lib/libc/rpc/clnt_vc.c
--- a/lib/libc/rpc/clnt_vc.c    Wed Dec 08 02:05:39 2010 +0000
+++ b/lib/libc/rpc/clnt_vc.c    Wed Dec 08 02:06:38 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clnt_vc.c,v 1.16 2009/02/12 16:24:59 uebayasi Exp $    */
+/*     $NetBSD: clnt_vc.c,v 1.17 2010/12/08 02:06:38 joerg Exp $       */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -36,7 +36,7 @@
 static char *sccsid = "@(#)clnt_tcp.c  2.2 88/08/01 4.0 RPCSRC";
 static char sccsid[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
 #else
-__RCSID("$NetBSD: clnt_vc.c,v 1.16 2009/02/12 16:24:59 uebayasi Exp $");
+__RCSID("$NetBSD: clnt_vc.c,v 1.17 2010/12/08 02:06:38 joerg Exp $");
 #endif
 #endif
  
@@ -126,7 +126,6 @@
  */
 #ifdef _REENTRANT
 static int      *vc_fd_locks;
-extern int __isthreaded;
 #define __rpc_lock_value __isthreaded;
 extern mutex_t  clnt_fd_lock;
 static cond_t   *vc_cv;
diff -r 5e7618d00af6 -r e8ade9d95776 lib/libc/rpc/getnetconfig.c
--- a/lib/libc/rpc/getnetconfig.c       Wed Dec 08 02:05:39 2010 +0000
+++ b/lib/libc/rpc/getnetconfig.c       Wed Dec 08 02:06:38 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getnetconfig.c,v 1.17 2008/04/25 17:44:44 christos Exp $       */
+/*     $NetBSD: getnetconfig.c,v 1.18 2010/12/08 02:06:38 joerg Exp $  */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
 #if 0
 static        char sccsid[] = "@(#)getnetconfig.c      1.12 91/12/19 SMI";
 #else
-__RCSID("$NetBSD: getnetconfig.c,v 1.17 2008/04/25 17:44:44 christos Exp $");
+__RCSID("$NetBSD: getnetconfig.c,v 1.18 2010/12/08 02:06:38 joerg Exp $");
 #endif
 #endif
 
@@ -160,7 +160,6 @@
 __nc_error()
 {
 #ifdef _REENTRANT
-       extern int __isthreaded;
        int *nc_addr = NULL;
 #endif
        static int nc_error = 0;
diff -r 5e7618d00af6 -r e8ade9d95776 lib/libc/rpc/mt_misc.c
--- a/lib/libc/rpc/mt_misc.c    Wed Dec 08 02:05:39 2010 +0000
+++ b/lib/libc/rpc/mt_misc.c    Wed Dec 08 02:06:38 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mt_misc.c,v 1.7 2008/04/28 20:23:00 martin Exp $       */
+/*     $NetBSD: mt_misc.c,v 1.8 2010/12/08 02:06:38 joerg Exp $        */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: mt_misc.c,v 1.7 2008/04/28 20:23:00 martin Exp $");
+__RCSID("$NetBSD: mt_misc.c,v 1.8 2010/12/08 02:06:38 joerg Exp $");
 #endif
 
 #include       "namespace.h"
@@ -116,7 +116,6 @@
 {
 #ifdef _REENTRANT
        struct rpc_createerr *rce_addr = 0;
-       extern int __isthreaded;
 
        if (__isthreaded == 0)
                return (&rpc_createerr);
diff -r 5e7618d00af6 -r e8ade9d95776 lib/libc/rpc/rpc_generic.c
--- a/lib/libc/rpc/rpc_generic.c        Wed Dec 08 02:05:39 2010 +0000
+++ b/lib/libc/rpc/rpc_generic.c        Wed Dec 08 02:06:38 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_generic.c,v 1.23 2008/04/25 17:44:44 christos Exp $        */
+/*     $NetBSD: rpc_generic.c,v 1.24 2010/12/08 02:06:38 joerg Exp $   */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: rpc_generic.c,v 1.23 2008/04/25 17:44:44 christos Exp $");
+__RCSID("$NetBSD: rpc_generic.c,v 1.24 2010/12/08 02:06:38 joerg Exp $");
 #endif
 
 #include "namespace.h"
@@ -258,8 +258,6 @@
        static char *netid_udp_main;
        struct netconfig *dummy;
 #ifdef _REENTRANT
-       extern int __isthreaded;
-
        if (__isthreaded == 0) {
                netid_udp = netid_udp_main;
                netid_tcp = netid_tcp_main;
diff -r 5e7618d00af6 -r e8ade9d95776 lib/libc/rpc/rpc_soc.c
--- a/lib/libc/rpc/rpc_soc.c    Wed Dec 08 02:05:39 2010 +0000
+++ b/lib/libc/rpc/rpc_soc.c    Wed Dec 08 02:06:38 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_soc.c,v 1.12 2005/11/29 03:12:00 christos Exp $    */
+/*     $NetBSD: rpc_soc.c,v 1.13 2010/12/08 02:06:38 joerg Exp $       */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)rpc_soc.c 1.41 89/05/02 Copyr 1988 Sun Micro";
 #else
-__RCSID("$NetBSD: rpc_soc.c,v 1.12 2005/11/29 03:12:00 christos Exp $");
+__RCSID("$NetBSD: rpc_soc.c,v 1.13 2010/12/08 02:06:38 joerg Exp $");
 #endif
 #endif
 
@@ -395,9 +395,6 @@
        struct netconfig *nconf; /* Netconf of the transport */
 {
        resultproc_t clnt_broadcast_result;
-#ifdef _REENTRANT
-       extern int __isthreaded;
-#endif
 
        _DIAGASSERT(resultp != NULL);
        _DIAGASSERT(addr != NULL);
@@ -443,8 +440,6 @@
        resultproc_t    eachresult;     /* call with each result obtained */
 {
 #ifdef _REENTRANT
-       extern int __isthreaded;
-
        if (__isthreaded == 0)
                clnt_broadcast_result_main = eachresult;
        else {