clones/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2024-09-21 14:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct operator precedence in ev bits conversions

Browse Source 
git-svn-id: file:///svn/unbound/trunk@3667 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Willem Toorop 2016-03-11 11:56:34 +00:00
parent 11a6ce0f3c
commit a36136f82c
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
util/ub_event.c
View File

@ -71,18 +71,18 @@
UB_EV_PERSIST != EV_PERSIST
/* Only necessary for libev */
# define NATIVE_BITS(b) ( \
((b) & UB_EV_TIMEOUT) ? EV_TIMEOUT : 0 \
| ((b) & UB_EV_READ ) ? EV_READ : 0 \
| ((b) & UB_EV_WRITE ) ? EV_WRITE : 0 \
| ((b) & UB_EV_SIGNAL ) ? EV_SIGNAL : 0 \
| ((b) & UB_EV_PERSIST) ? EV_PERSIST : 0)
(((b) & UB_EV_TIMEOUT) ? EV_TIMEOUT : 0) \
| (((b) & UB_EV_READ ) ? EV_READ : 0) \
| (((b) & UB_EV_WRITE ) ? EV_WRITE : 0) \
| (((b) & UB_EV_SIGNAL ) ? EV_SIGNAL : 0) \
| (((b) & UB_EV_PERSIST) ? EV_PERSIST : 0))
# define UB_EV_BITS(b) ( \
((b) & EV_TIMEOUT) ? UB_EV_TIMEOUT : 0 \
| ((b) & EV_READ ) ? UB_EV_READ : 0 \
| ((b) & EV_WRITE ) ? UB_EV_WRITE : 0 \
| ((b) & EV_SIGNAL ) ? UB_EV_SIGNAL : 0 \
| ((b) & EV_PERSIST) ? UB_EV_PERSIST : 0)
(((b) & EV_TIMEOUT) ? UB_EV_TIMEOUT : 0) \
| (((b) & EV_READ ) ? UB_EV_READ : 0) \
| (((b) & EV_WRITE ) ? UB_EV_WRITE : 0) \
| (((b) & EV_SIGNAL ) ? UB_EV_SIGNAL : 0) \
| (((b) & EV_PERSIST) ? UB_EV_PERSIST : 0))
# define UB_EV_BITS_CB(C) void my_ ## C (int fd, short bits, void *arg) \
{ (C)(fd, UB_EV_BITS(bits), arg); }

20
util/ub_event_pluggable.c
View File

@ -73,18 +73,18 @@
UB_EV_PERSIST != EV_PERSIST
/* Only necessary for libev */
# define NATIVE_BITS(b) ( \
((b) & UB_EV_TIMEOUT) ? EV_TIMEOUT : 0 \
| ((b) & UB_EV_READ ) ? EV_READ : 0 \
| ((b) & UB_EV_WRITE ) ? EV_WRITE : 0 \
| ((b) & UB_EV_SIGNAL ) ? EV_SIGNAL : 0 \
| ((b) & UB_EV_PERSIST) ? EV_PERSIST : 0)
(((b) & UB_EV_TIMEOUT) ? EV_TIMEOUT : 0) \
| (((b) & UB_EV_READ ) ? EV_READ : 0) \
| (((b) & UB_EV_WRITE ) ? EV_WRITE : 0) \
| (((b) & UB_EV_SIGNAL ) ? EV_SIGNAL : 0) \
| (((b) & UB_EV_PERSIST) ? EV_PERSIST : 0))
# define UB_EV_BITS(b) ( \
((b) & EV_TIMEOUT) ? UB_EV_TIMEOUT : 0 \
| ((b) & EV_READ ) ? UB_EV_READ : 0 \
| ((b) & EV_WRITE ) ? UB_EV_WRITE : 0 \
| ((b) & EV_SIGNAL ) ? UB_EV_SIGNAL : 0 \
| ((b) & EV_PERSIST) ? UB_EV_PERSIST : 0)
(((b) & EV_TIMEOUT) ? UB_EV_TIMEOUT : 0) \
| (((b) & EV_READ ) ? UB_EV_READ : 0) \
| (((b) & EV_WRITE ) ? UB_EV_WRITE : 0) \
| (((b) & EV_SIGNAL ) ? UB_EV_SIGNAL : 0) \
| (((b) & EV_PERSIST) ? UB_EV_PERSIST : 0))
# define UB_EV_BITS_CB(C) void my_ ## C (int fd, short bits, void *arg) \
{ (C)(fd, UB_EV_BITS(bits), arg); }