diff options
| author | jvoisin | 2023-05-30 20:13:40 +0200 |
|---|---|---|
| committer | jvoisin | 2023-05-30 20:13:40 +0200 |
| commit | b40f6d87482f20e968b27470baca042e50cd6792 (patch) | |
| tree | 33aede62c7c325deb213b8a890e0cd64b5b75385 /include | |
| parent | fa40365faea6b87288504f0d8ad39dab8ff302b4 (diff) | |
Fix inconsistent time_t version of ppoll
fortify/poll.h includes poll.h, which redirects the ppoll sys call to __ppoll_time64,
if the _REDIR_TIME64 macro is 1. Then fortify/poll.h will #undef ppoll and use the 32 bit version, which is inconsistent.
Taken from: https://github.com/openwrt/openwrt/pull/12575
Diffstat (limited to 'include')
| -rw-r--r-- | include/poll.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/poll.h b/include/poll.h index cf1b9e5..a50a0d6 100644 --- a/include/poll.h +++ b/include/poll.h | |||
| @@ -39,7 +39,7 @@ _FORTIFY_FN(poll) int poll(struct pollfd *__f, nfds_t __n, int __s) | |||
| 39 | return __orig_poll(__f, __n, __s); | 39 | return __orig_poll(__f, __n, __s); |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | #ifdef _GNU_SOURCE | 42 | #if defined(_GNU_SOURCE) && !_REDIR_TIME64 |
| 43 | #undef ppoll | 43 | #undef ppoll |
| 44 | _FORTIFY_FN(ppoll) int ppoll(struct pollfd *__f, nfds_t __n, const struct timespec *__s, | 44 | _FORTIFY_FN(ppoll) int ppoll(struct pollfd *__f, nfds_t __n, const struct timespec *__s, |
| 45 | const sigset_t *__m) | 45 | const sigset_t *__m) |