History

define __poll_t, annotate constants

Al Viro committed 9 years ago

Commit 8ced3901 parent d759be88 files · +32 −26Browse files

Showing the changes to include/uapi (2 of 8 files). Show all

Unified · Split

2 files
  1. include/uapi/asm-generic/poll.h +15 −15
  2. include/uapi/linux/types.h +6 −0
include/uapi/asm-generic/poll.h+15−15
@@ -3,35 +3,35 @@ · 2 unmodified lines
33 #define __ASM_GENERIC_POLL_H
44
55 /* These are specified by iBCS2 */
6−#define POLLIN 0x0001
7−#define POLLPRI 0x0002
8−#define POLLOUT 0x0004
9−#define POLLERR 0x0008
10−#define POLLHUP 0x0010
11−#define POLLNVAL 0x0020
6+#define POLLIN (__force __poll_t)0x0001
7+#define POLLPRI (__force __poll_t)0x0002
8+#define POLLOUT (__force __poll_t)0x0004
9+#define POLLERR (__force __poll_t)0x0008
10+#define POLLHUP (__force __poll_t)0x0010
11+#define POLLNVAL (__force __poll_t)0x0020
1212
1313 /* The rest seem to be more-or-less nonstandard. Check them! */
14−#define POLLRDNORM 0x0040
15−#define POLLRDBAND 0x0080
14+#define POLLRDNORM (__force __poll_t)0x0040
15+#define POLLRDBAND (__force __poll_t)0x0080
1616 #ifndef POLLWRNORM
17−#define POLLWRNORM 0x0100
17+#define POLLWRNORM (__force __poll_t)0x0100
1818 #endif
1919 #ifndef POLLWRBAND
20−#define POLLWRBAND 0x0200
20+#define POLLWRBAND (__force __poll_t)0x0200
2121 #endif
2222 #ifndef POLLMSG
23−#define POLLMSG 0x0400
23+#define POLLMSG (__force __poll_t)0x0400
2424 #endif
2525 #ifndef POLLREMOVE
26−#define POLLREMOVE 0x1000
26+#define POLLREMOVE (__force __poll_t)0x1000
2727 #endif
2828 #ifndef POLLRDHUP
29−#define POLLRDHUP 0x2000
29+#define POLLRDHUP (__force __poll_t)0x2000
3030 #endif
3131
32−#define POLLFREE 0x4000 /* currently only for epoll */
32+#define POLLFREE (__force __poll_t)0x4000 /* currently only for epoll */
3333
34−#define POLL_BUSY_LOOP 0x8000
34+#define POLL_BUSY_LOOP (__force __poll_t)0x8000
3535
3636 struct pollfd {
3737 int fd;
include/uapi/linux/types.h+6−0
@@ -49,5 +49,11 @@ typedef __u32 __bitwise __wsum; · 48 unmodified lines
4949 #define __aligned_be64 __be64 __attribute__((aligned(8)))
5050 #define __aligned_le64 __le64 __attribute__((aligned(8)))
5151
52+#ifdef __CHECK_POLL
53+typedef unsigned __bitwise __poll_t;
54+#else
55+typedef unsigned __poll_t;
56+#endif
57+
5258 #endif /* __ASSEMBLY__ */
5359 #endif /* _UAPI_LINUX_TYPES_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t