Correct operator precedence in ev bits conversions

git-svn-id: file:///svn/unbound/trunk@3667 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/util/ub_event.c b/util/ub_event.c
index 737ef39457ab761ffedc0484ea912401b91dcbb4..b4d6ccf69a4b6a37136a423d14d952f917b7e150 100644 (file)
--- a/util/ub_event.c
+++ b/util/ub_event.c
@@ -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); }

diff --git a/util/ub_event_pluggable.c b/util/ub_event_pluggable.c
index 2f662ecad4a694ee6914643a5baa4ee43d305491..3ba1f29136331cb6fed79f066d2c20f155b16967 100644 (file)
--- a/util/ub_event_pluggable.c
+++ b/util/ub_event_pluggable.c
@@ -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); }