Merge \"Fix misc-macro-parentheses warnings in system/core.\"
am: 495541c5bb
Change-Id: I021b653779c5119398c31ee354372366ba029328
diff --git a/fastboot/engine.cpp b/fastboot/engine.cpp
index db5d0e0..a245e49 100644
--- a/fastboot/engine.cpp
+++ b/fastboot/engine.cpp
@@ -38,7 +38,7 @@
#include <sys/types.h>
#include <unistd.h>
-#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
#define OP_DOWNLOAD 1
#define OP_COMMAND 2
diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp
index 5846626..612885b 100644
--- a/healthd/healthd_mode_charger.cpp
+++ b/healthd/healthd_mode_charger.cpp
@@ -58,7 +58,7 @@
#define min(a,b) ((a) < (b) ? (a) : (b))
#endif
-#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
#define MSEC_PER_SEC (1000LL)
#define NSEC_PER_MSEC (1000000LL)
diff --git a/init/util.h b/init/util.h
index c2efb01..b9496a9 100644
--- a/init/util.h
+++ b/init/util.h
@@ -23,7 +23,7 @@
#include <string>
#include <functional>
-#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
#define COLDBOOT_DONE "/dev/.coldboot_done"
diff --git a/trusty/storage/tests/main.cpp b/trusty/storage/tests/main.cpp
index a771b87..1fd6f8d 100644
--- a/trusty/storage/tests/main.cpp
+++ b/trusty/storage/tests/main.cpp
@@ -23,7 +23,7 @@
#define TRUSTY_DEVICE_NAME "/dev/trusty-ipc-dev0"
-#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
static inline bool is_32bit_aligned(size_t sz)
{