summaryrefslogtreecommitdiffstats
path: root/lib/libc
diff options
context:
space:
mode:
authortheraven <theraven@FreeBSD.org>2014-04-06 17:06:27 +0000
committertheraven <theraven@FreeBSD.org>2014-04-06 17:06:27 +0000
commit56dbb20db8877f2da30cf4163b4c992147b4d148 (patch)
tree66c2907e5df365df45a8a1c4ed8a6a0acef628c2 /lib/libc
parent91f2810b1435fb4508dd729d13f98741a5e2441f (diff)
downloadFreeBSD-src-56dbb20db8877f2da30cf4163b4c992147b4d148.zip
FreeBSD-src-56dbb20db8877f2da30cf4163b4c992147b4d148.tar.gz
Move definitions out of rpc_com so that the linker doesn't complain about
multiple definitions. Reported by: sbruno
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/rpc/rpc_com.h4
-rw-r--r--lib/libc/rpc/svc.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/libc/rpc/rpc_com.h b/lib/libc/rpc/rpc_com.h
index 770faf9..bfa6a0b 100644
--- a/lib/libc/rpc/rpc_com.h
+++ b/lib/libc/rpc/rpc_com.h
@@ -86,8 +86,8 @@ bool_t __xdrrec_setnonblock(XDR *, int);
bool_t __xdrrec_getrec(XDR *, enum xprt_stat *, bool_t);
void __xprt_unregister_unlocked(SVCXPRT *);
-SVCXPRT **__svc_xports;
-int __svc_maxrec;
+extern SVCXPRT **__svc_xports;
+extern int __svc_maxrec;
__END_DECLS
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index fff04c0..8203bd9 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -84,6 +84,9 @@ static struct svc_callout {
void (*sc_dispatch)(struct svc_req *, SVCXPRT *);
} *svc_head;
+SVCXPRT **__svc_xports;
+int __svc_maxrec;
+
static struct svc_callout *svc_find(rpcprog_t, rpcvers_t,
struct svc_callout **, char *);
static void __xprt_do_unregister (SVCXPRT *xprt, bool_t dolock);
OpenPOWER on IntegriCloud