git: da5aed38d80a - main - Revert "Tweak ppoll() to include 1003.1-2024 visibility"

The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=da5aed38d80a000a6bc3819e51c9f5c0ed5a77a1

commit da5aed38d80a000a6bc3819e51c9f5c0ed5a77a1
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2024-12-14 07:05:09 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
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 <sys/_types.h>
 
 #include <sys/_sigset.h>
@@ -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);