Merge "Fix misc-macro-parentheses warnings in system/core."

aosp-mirror · Jun 22, 2016 · 495541c · 495541c
2 parents cfdd57e + cdb2ca5
commit 495541c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -58,7 +58,7 @@ char *locale;
 #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
@@ -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
@@ -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)
 {