From nobody Sat Dec 14 07:06:26 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 4Y9HLV6nfzz5gpYk; Sat, 14 Dec 2024 07:06:26 +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 4Y9HLV6BlDz4F7m; Sat, 14 Dec 2024 07:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734159986; 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=52UaCzUbsfCSgxVZFALTrhcd9ZxhOTRcNeQOUyaKq2E=; b=T5oHgUg2YI6ROm/KkRTx25y2AWqcJ5eVtMcZ4W5c+2i+j13prAc53vJd0YSTo72Fj/sdxH 2A/5DZuno3z/guKs49BATkrLkG69cLS5kBrR5J1GpI9yPxZcfjOwlWpk+HukMrVj0uTFF1 9pxSthNXSiNds7WkOnEAal9Zi9Wy6T3XEPQ3EjjJKxCiPMczDzJ0KoykgVWoQH8iZutEB1 gToz5mqTRFlo6Lt0gH53Iko7yuNW6IwKYDl7NuBZb53lYbFcZcJyf9V38GnhilK89aAPsk LRwjy6jvk2grAfHOWI2wHyh6ssHz0EJFqz/WEmGZj4qJzxeBoyTuSASow1cgqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734159986; 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=52UaCzUbsfCSgxVZFALTrhcd9ZxhOTRcNeQOUyaKq2E=; b=DiFMeZPSyJdcmKmsCjz7/S7AGbwRV8G3h13BApt49RUFM/+3EuRXJNmNWTg/uPi3G8W3my uHv/tpOQyckyMByU8Ves7rrbgv1jogsYUaTO79hYphYeQWqrF1QT0Pn5iWv6Kw4rljC/Q+ M1HhXlCVkwB4z9/OvXzWAPYHqAxm+dziOh2zm7KyTgwPZem5n2JFLQzVCpt/raGGUbQ39I 1oSKnqJWhs+2t1wAus79DUfQiAbLjnyH76/dLTbOzV69ysKOPNoXU5yB6tNWX9ZBIc6XsI rjoZEjh1Pidy6LMv7DBhOf5F92DYpTsLeyvmYp6fpROeAMEtzcKckoBm4xpP5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734159986; a=rsa-sha256; cv=none; b=LFwrN2+sP+bi7PTSncZGPCf1QS6N9BsnMkbad40IhLn79Ux6u3gdSawccKsBg1pPyK1+6B paFZ1KPp2E9UboBl+yv5QmkaUbNUeNeJrD596S7W/yJAuFk4iqnxTo2OJqYxyv/SO0aqOF kFRpC0G/e/qXruYclylFl7iyLxm0OeZK2r/OwDDPzaGbbHWpI4Y+nwJVJzdpQ7iQq7Nlog keBsaf+s2mWxd9g8EKdAz8d+OqpybnqNWYbWUUEU4mrdtc/JC0f8lWQ3FDbKGJ5Y4ztSPi GiE9f9tcSRllNCDkn4Ro27ihS4bkPuM0xxrrvMpiQLjiWBsGginMYbSFFrJwPA== 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 4Y9HLV5ksBz1ByJ; Sat, 14 Dec 2024 07:06:26 +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 4BE76Qgw030427; Sat, 14 Dec 2024 07:06:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE76Qci030424; Sat, 14 Dec 2024 07:06:26 GMT (envelope-from git) Date: Sat, 14 Dec 2024 07:06:26 GMT Message-Id: <202412140706.4BE76Qci030424@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: da5aed38d80a - main - Revert "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: da5aed38d80a000a6bc3819e51c9f5c0ed5a77a1 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=da5aed38d80a000a6bc3819e51c9f5c0ed5a77a1 commit da5aed38d80a000a6bc3819e51c9f5c0ed5a77a1 Author: Kyle Evans AuthorDate: 2024-12-14 07:05:09 +0000 Commit: Kyle Evans CommitDate: 2024-12-14 07:05:09 +0000 Revert "Tweak ppoll() to include 1003.1-2024 visibility" This reverts commit 212d7f439aa3fa276e87291c1e83545298381824. A last minute change to remove __BSD_VISIBLE unearthed some breakage that I failed to re-test. Sigh. --- include/ssp/poll.h | 4 ++-- lib/libsys/poll.2 | 5 ++--- sys/sys/poll.h | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/ssp/poll.h b/include/ssp/poll.h index 231fef3ef364..815e73eb46b7 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 _POSIX_C_SOURCE >= 202405 +#if __BSD_VISIBLE __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 /* _POSIX_C_SOURCE >= 202405 */ +#endif /* __BSD_VISIBLE */ __END_DECLS #endif /* __SSP_FORTIFY_LEVEL > 0 */ diff --git a/lib/libsys/poll.2 b/lib/libsys/poll.2 index 6e6ed33f7a6b..6a5cc1dc3a89 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 December 11, 2024 +.Dd April 27, 2021 .Dt POLL 2 .Os .Sh NAME @@ -268,8 +268,7 @@ function conforms to .St -p1003.1-2001 . The .Fn ppoll -function conforms to -.St -p1003.1-2024 . +is not specified by POSIX. 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 4b626d722b09..d5f2c0373942 100644 --- a/sys/sys/poll.h +++ b/sys/sys/poll.h @@ -96,7 +96,7 @@ struct pollfd { #ifndef _KERNEL -#if _POSIX_C_SOURCE >= 202405 +#if __BSD_VISIBLE #include #include @@ -115,7 +115,7 @@ typedef __sigset_t sigset_t; __BEGIN_DECLS int poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout); -#if _POSIX_C_SOURCE >= 202405 +#if __BSD_VISIBLE int ppoll(struct pollfd _pfd[], nfds_t _nfds, const struct timespec *__restrict _timeout, const sigset_t *__restrict _newsigmask);