Date: Sun, 6 Apr 2014 17:06:27 +0000 (UTC) From: David Chisnall <theraven@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264196 - head/lib/libc/rpc Message-ID: <201404061706.s36H6RIC088772@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: theraven Date: Sun Apr 6 17:06:27 2014 New Revision: 264196 URL: http://svnweb.freebsd.org/changeset/base/264196 Log: Move definitions out of rpc_com so that the linker doesn't complain about multiple definitions. Reported by: sbruno Modified: head/lib/libc/rpc/rpc_com.h head/lib/libc/rpc/svc.c Modified: head/lib/libc/rpc/rpc_com.h ============================================================================== --- head/lib/libc/rpc/rpc_com.h Sun Apr 6 16:48:00 2014 (r264195) +++ head/lib/libc/rpc/rpc_com.h Sun Apr 6 17:06:27 2014 (r264196) @@ -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 Modified: head/lib/libc/rpc/svc.c ============================================================================== --- head/lib/libc/rpc/svc.c Sun Apr 6 16:48:00 2014 (r264195) +++ head/lib/libc/rpc/svc.c Sun Apr 6 17:06:27 2014 (r264196) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404061706.s36H6RIC088772>