diff options
author | David Chisnall <theraven@FreeBSD.org> | 2014-04-06 17:06:27 +0000 |
---|---|---|
committer | David Chisnall <theraven@FreeBSD.org> | 2014-04-06 17:06:27 +0000 |
commit | 635d1cf10849843713b7dbf0151c4e16c26ba15d (patch) | |
tree | 66c2907e5df365df45a8a1c4ed8a6a0acef628c2 /lib/libc/rpc | |
parent | f3c447c445cd535b0256cd1beca8d573a1e0d224 (diff) | |
download | src-635d1cf10849843713b7dbf0151c4e16c26ba15d.tar.gz src-635d1cf10849843713b7dbf0151c4e16c26ba15d.zip |
Move definitions out of rpc_com so that the linker doesn't complain about
multiple definitions.
Reported by: sbruno
Notes
Notes:
svn path=/head/; revision=264196
Diffstat (limited to 'lib/libc/rpc')
-rw-r--r-- | lib/libc/rpc/rpc_com.h | 4 | ||||
-rw-r--r-- | lib/libc/rpc/svc.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/libc/rpc/rpc_com.h b/lib/libc/rpc/rpc_com.h index 770faf915594..bfa6a0bca882 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 fff04c01a72d..8203bd9f12f9 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); |