Skip to content

Commit

Permalink
Tweak ppoll() to include 1003.1-2024 visibility
Browse files Browse the repository at this point in the history
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
  • Loading branch information
kevans91 committed Dec 14, 2024
1 parent 35e6313 commit 212d7f4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions include/ssp/poll.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 */
Expand Down
5 changes: 3 additions & 2 deletions lib/libsys/poll.2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions sys/sys/poll.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ struct pollfd {

#ifndef _KERNEL

#if __BSD_VISIBLE
#if _POSIX_C_SOURCE >= 202405
#include <sys/_types.h>

#include <sys/_sigset.h>
Expand All @@ -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);
Expand Down

0 comments on commit 212d7f4

Please sign in to comment.