From owner-svn-src-all@freebsd.org Fri Dec 14 21:16:05 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 213081318062; Fri, 14 Dec 2018 21:16:05 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BBD506BCEC; Fri, 14 Dec 2018 21:16:04 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A860554B6; Fri, 14 Dec 2018 21:16:04 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBELG4Ow008770; Fri, 14 Dec 2018 21:16:04 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBELG4Tn008769; Fri, 14 Dec 2018 21:16:04 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201812142116.wBELG4Tn008769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Fri, 14 Dec 2018 21:16:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r342101 - head/lib/libnv X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head/lib/libnv X-SVN-Commit-Revision: 342101 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BBD506BCEC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.85 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.989,0]; NEURAL_HAM_LONG(-0.88)[-0.883,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2018 21:16:05 -0000 Author: arichardson Date: Fri Dec 14 21:16:04 2018 New Revision: 342101 URL: https://svnweb.freebsd.org/changeset/base/342101 Log: Allow bootstrapping libnv on macOS and Linux MacOS/Linux do not define struct cmsgcred but we need to bootstrap libnv when building on non-FreeBSD systems. Since they are not used during bootstrap we can just omit these two functions there. Reviewed By: emaste Differential Revision: https://reviews.freebsd.org/D18472 Modified: head/lib/libnv/msgio.c Modified: head/lib/libnv/msgio.c ============================================================================== --- head/lib/libnv/msgio.c Fri Dec 14 21:07:12 2018 (r342100) +++ head/lib/libnv/msgio.c Fri Dec 14 21:16:04 2018 (r342101) @@ -157,6 +157,14 @@ msg_send(int sock, const struct msghdr *msg) return (0); } +/* + * MacOS/Linux do not define struct cmsgcred but we need to bootstrap libnv + * when building on non-FreeBSD systems. Since they are not used during + * bootstrap we can just omit these two functions there. + */ +#ifndef __FreeBSD__ +#warning "cred_send() not supported on non-FreeBSD systems" +#else int cred_send(int sock) { @@ -232,6 +240,7 @@ cred_recv(int sock, struct cmsgcred *cred) return (0); } +#endif static int fd_package_send(int sock, const int *fds, size_t nfds)