From nobody Sat Dec 14 04:15:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9CYm4ps2z5gdZ4; Sat, 14 Dec 2024 04:15:56 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9CYm401lz4vsB; Sat, 14 Dec 2024 04:15:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734149756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CUi/lfvdfP9pXo7SZa41Ep74/Klm2xVbUo6IygNDMrM=; b=AEQxpIImzLJZXp67za/hmgTSpZ+pDaXjBFTz4gr+4XQhmI37sn7GuMLJuGvz7mkOhrSu2l EIeTUf91VaCArYFYx7BxnKCH0khe8/oQKFOIfIvfwEUG96ulsKCHw/m65kjO7jQ4R+VwCY hJcGFTYMDMTc2MuleqJ98zJuO/fZhaoz611sNTBeyn+n6ks5dW0EbiIxLjpPj9QDmyzMyX HMQTifu1BpluU1UEX/PKU56HIXvpV2F0BV2ccnzX5p+thE23SXuFbspcGAxn3aF2H8lRSc hnsvqJgFwaZ8+A12OvhCVYHyKqv4Ba9HE1Vwgg/y1gQVzXHf4d8WkVyNSmSfjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734149756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CUi/lfvdfP9pXo7SZa41Ep74/Klm2xVbUo6IygNDMrM=; b=UOovs5JHlYpNuFmJHkODu/sSFpkpd365HJtso+VQS0+wd8BEdVAFPqH6QsVm5zwWkH2Nes nh7/wwAuvETocLFumCDqBcPVnCNyiB+aci2bGKGz0Xl3QVfKhwIDNlYPcU+NnoHqguKdgk NhaIYrlX4Q8NHyhe+uQoGx+BG1k3FydzETNImBvY957zbScwM4NZamiyxWcz61dN6goCh9 k4N51KAJawuvIZyndSyego7muAt1L6UhBcCjfOrqJxsApHey3bXle7nBDkaW6OFy+xja9m N3i7ZpYSeyDotbu3th62ay5pAuuQHCW86wiKmwaWfgF5CC5oUP2bYCjEKfHqnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734149756; a=rsa-sha256; cv=none; b=NNBAtdpgrygTPM1Z97J6MEluUi2ysVDG+ffJ7HWdJEG7zyWgvZawSFZVmxUMTX4R67UfU0 WMxcs/1vwM0UfhcRNjbpCoziFuAaHS5k5uFmSCofVoeNswyhCq8KrUuHoXAWXs8NqJxC5E B0fsjA3+PGZk7oGxwx6Eaw3riH31cptKEMeHFAfl/uOF8u2iWZqv0XQRJCBJDKBjzhkqkv ubZbgPtLdJ0iZ/4T8TukqaTIhOQNmSzz7ypReXqmMjAB6YdynCMiFY/Jqfqa+g06Mx2ebG YsCViFldvbvxZGGFJiYOYtWnNrEdoIJ8W2wEaz18HmvByuJ1dY9Fn0FYBZqRng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9CYm3HGBz16PZ; Sat, 14 Dec 2024 04:15:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BE4FuVY012044; Sat, 14 Dec 2024 04:15:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE4Fuwp012041; Sat, 14 Dec 2024 04:15:56 GMT (envelope-from git) Date: Sat, 14 Dec 2024 04:15:56 GMT Message-Id: <202412140415.4BE4Fuwp012041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 212d7f439aa3 - main - Tweak ppoll() to include 1003.1-2024 visibility List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 212d7f439aa3fa276e87291c1e83545298381824 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=212d7f439aa3fa276e87291c1e83545298381824 commit 212d7f439aa3fa276e87291c1e83545298381824 Author: Kyle Evans AuthorDate: 2024-12-14 04:15:19 +0000 Commit: Kyle Evans CommitDate: 2024-12-14 04:15:19 +0000 Tweak ppoll() to include 1003.1-2024 visibility Note in the manpage that the 2024 edition finally added ppoll(), and also add the appropriate declarations for the correct versions of _POSIX_C_SOURCE. Differential Revision: https://reviews.freebsd.org/D48043 --- include/ssp/poll.h | 4 ++-- lib/libsys/poll.2 | 5 +++-- sys/sys/poll.h | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/ssp/poll.h b/include/ssp/poll.h index 815e73eb46b7..231fef3ef364 100644 --- a/include/ssp/poll.h +++ b/include/ssp/poll.h @@ -42,7 +42,7 @@ __ssp_redirect_raw_impl(int, poll, poll, return (__ssp_real(poll)(fds, nfds, timeout)); } -#if __BSD_VISIBLE +#if _POSIX_C_SOURCE >= 202405 __ssp_redirect_raw_impl(int, ppoll, ppoll, (struct pollfd fds[], nfds_t nfds, const struct timespec *__restrict timeout, @@ -53,7 +53,7 @@ __ssp_redirect_raw_impl(int, ppoll, ppoll, return (__ssp_real(ppoll)(fds, nfds, timeout, newsigmask)); } -#endif /* __BSD_VISIBLE */ +#endif /* _POSIX_C_SOURCE >= 202405 */ __END_DECLS #endif /* __SSP_FORTIFY_LEVEL > 0 */ diff --git a/lib/libsys/poll.2 b/lib/libsys/poll.2 index 6a5cc1dc3a89..6e6ed33f7a6b 100644 --- a/lib/libsys/poll.2 +++ b/lib/libsys/poll.2 @@ -27,7 +27,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 27, 2021 +.Dd December 11, 2024 .Dt POLL 2 .Os .Sh NAME @@ -268,7 +268,8 @@ function conforms to .St -p1003.1-2001 . The .Fn ppoll -is not specified by POSIX. +function conforms to +.St -p1003.1-2024 . The POLLRDHUP flag is not specified by POSIX, but is compatible with Linux and illumos. diff --git a/sys/sys/poll.h b/sys/sys/poll.h index d5f2c0373942..4b626d722b09 100644 --- a/sys/sys/poll.h +++ b/sys/sys/poll.h @@ -96,7 +96,7 @@ struct pollfd { #ifndef _KERNEL -#if __BSD_VISIBLE +#if _POSIX_C_SOURCE >= 202405 #include #include @@ -115,7 +115,7 @@ typedef __sigset_t sigset_t; __BEGIN_DECLS int poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout); -#if __BSD_VISIBLE +#if _POSIX_C_SOURCE >= 202405 int ppoll(struct pollfd _pfd[], nfds_t _nfds, const struct timespec *__restrict _timeout, const sigset_t *__restrict _newsigmask);