Author: ngie Date: Sat Dec 3 19:52:33 2016 New Revision: 309507 URL: https://svnweb.freebsd.org/changeset/base/309507
Log: MFC r264196: r264196 (by theraven): Move definitions out of rpc_com so that the linker doesn't complain about multiple definitions. Modified: stable/10/lib/libc/rpc/rpc_com.h stable/10/lib/libc/rpc/svc.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/rpc/rpc_com.h ============================================================================== --- stable/10/lib/libc/rpc/rpc_com.h Sat Dec 3 19:21:35 2016 (r309506) +++ stable/10/lib/libc/rpc/rpc_com.h Sat Dec 3 19:52:33 2016 (r309507) @@ -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: stable/10/lib/libc/rpc/svc.c ============================================================================== --- stable/10/lib/libc/rpc/svc.c Sat Dec 3 19:21:35 2016 (r309506) +++ stable/10/lib/libc/rpc/svc.c Sat Dec 3 19:52:33 2016 (r309507) @@ -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); _______________________________________________ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"