Fix misc-macro-parentheses warnings in bionic.
Add parentheses around macro arguments used beside operators,
or use constexpr for simple constants.
Bug: 28705665
Change-Id: I378c8aad92d3ec8e8c4b0440b5c2c99dfe01ce79
diff --git a/benchmarks/stdio_benchmark.cpp b/benchmarks/stdio_benchmark.cpp
index cc07128..a556d17 100644
--- a/benchmarks/stdio_benchmark.cpp
+++ b/benchmarks/stdio_benchmark.cpp
@@ -20,8 +20,7 @@
#include <benchmark/benchmark.h>
-#define KB 1024
-#define MB 1024*KB
+constexpr auto KB = 1024;
#define AT_COMMON_SIZES \
Arg(1)->Arg(2)->Arg(3)->Arg(4)->Arg(8)->Arg(16)->Arg(32)->Arg(64)->Arg(512)-> \
diff --git a/benchmarks/string_benchmark.cpp b/benchmarks/string_benchmark.cpp
index c04409d..0a38512 100644
--- a/benchmarks/string_benchmark.cpp
+++ b/benchmarks/string_benchmark.cpp
@@ -19,8 +19,7 @@
#include <benchmark/benchmark.h>
-#define KB 1024
-#define MB 1024*KB
+constexpr auto KB = 1024;
#define AT_COMMON_SIZES \
Arg(8)->Arg(64)->Arg(512)->Arg(1*KB)->Arg(8*KB)->Arg(16*KB)->Arg(32*KB)->Arg(64*KB)
diff --git a/linker/dlfcn.cpp b/linker/dlfcn.cpp
index 743b01d..a3ebcd6 100644
--- a/linker/dlfcn.cpp
+++ b/linker/dlfcn.cpp
@@ -176,14 +176,14 @@
{ name_offset, \
reinterpret_cast<Elf32_Addr>(value), \
/* st_size */ 0, \
- (shndx == 0) ? 0 : (STB_GLOBAL << 4), \
+ ((shndx) == 0) ? 0 : (STB_GLOBAL << 4), \
/* st_other */ 0, \
shndx, \
}
#define ELF64_SYM_INITIALIZER(name_offset, value, shndx) \
{ name_offset, \
- (shndx == 0) ? 0 : (STB_GLOBAL << 4), \
+ ((shndx) == 0) ? 0 : (STB_GLOBAL << 4), \
/* st_other */ 0, \
shndx, \
reinterpret_cast<Elf64_Addr>(value), \