fix wcwidth wrongly returning 0 for most of planes 4 and up

[oweals/musl.git] / include / poll.h

diff --git a/include/poll.h b/include/poll.h
index 9a785307a39f1489550a53e08a0eab860ea98708..472e4b8470bae3904100963200ac3dcfb7e34879 100644 (file)
--- a/include/poll.h
+++ b/include/poll.h
@@ -7,6 +7,8 @@ extern "C" {
 
 #include <features.h>
 
+#include <bits/poll.h>
+
 #define POLLIN     0x001
 #define POLLPRI    0x002
 #define POLLOUT    0x004
@@ -15,15 +17,18 @@ extern "C" {
 #define POLLNVAL   0x020
 #define POLLRDNORM 0x040
 #define POLLRDBAND 0x080
+#ifndef POLLWRNORM
 #define POLLWRNORM 0x100
 #define POLLWRBAND 0x200
+#endif
+#ifndef POLLMSG
 #define POLLMSG    0x400
 #define POLLRDHUP  0x2000
+#endif
 
 typedef unsigned long nfds_t;
 
-struct pollfd
-{
+struct pollfd {
        int fd;
        short events;
        short revents;
@@ -39,6 +44,12 @@ int poll (struct pollfd *, nfds_t, int);
 int ppoll(struct pollfd *, nfds_t, const struct timespec *, const sigset_t *);
 #endif
 
+#if _REDIR_TIME64
+#ifdef _GNU_SOURCE
+__REDIR(ppoll, __ppoll_time64);
+#endif
+#endif
+
 #ifdef __cplusplus
 }
 #endif