]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Fix the definition of atomic_load_explicit in the win32 shim
authorMark Andrews <marka@isc.org>
Wed, 1 Sep 2021 00:26:16 +0000 (10:26 +1000)
committerMark Andrews <marka@isc.org>
Wed, 1 Sep 2021 00:26:16 +0000 (10:26 +1000)
incorrect parentheses result in incorrect sizeof test

lib/isc/win32/include/isc/stdatomic.h

index c0f9a7da7016304fd0053a8ae2b787871570671f..bd790714c043e9bafca3cf57085b197836d639ce 100644 (file)
@@ -212,23 +212,23 @@ atomic_load_abort() {
 }
 
 #define atomic_load_explicit(obj, order)                                       \
-       ((sizeof(*(obj)) == 8                                                  \
+       (((sizeof(*(obj)) == 8)                                                \
                  ? atomic_load_explicit64(obj, order)                         \
-                 : (sizeof(*(obj) == 4)                                       \
+                 : ((sizeof(*(obj)) == 4)                                     \
                             ? atomic_load_explicit32(obj, order)              \
-                            : (sizeof(*(obj) == 2)                            \
+                            : ((sizeof(*(obj)) == 2)                          \
                                        ? atomic_load_explicit16(obj, order)   \
-                                       : (sizeof(*(obj) == 1)                 \
+                                       : ((sizeof(*(obj)) == 1)               \
                                                   ? atomic_load_explicit8(    \
                                                             obj, order)       \
                                                   : atomic_load_abort())))) & \
-        (sizeof(*(obj)) == 8                                                  \
+        ((sizeof(*(obj)) == 8)                                                \
                  ? 0xffffffffffffffffULL                                      \
-                 : (sizeof(*(obj)) == 4                                       \
+                 : ((sizeof(*(obj)) == 4)                                     \
                             ? 0xffffffffULL                                   \
-                            : (sizeof(*(obj)) == 2                            \
+                            : ((sizeof(*(obj)) == 2)                          \
                                        ? 0xffffULL                            \
-                                       : (sizeof(*(obj)) == 1                 \
+                                       : ((sizeof(*(obj)) == 1)               \
                                                   ? 0xffULL                   \
                                                   : atomic_load_abort())))))