Merge \\\"Fix misc-macro-parentheses warnings in system/core.\\\" am: 495541c5bb am: 65828a0ec9

am: 4a8ab16746

Change-Id: I5ba2a6d0813eb728f5863801a36de6a012a8242a
This commit is contained in:
Chih-Hung Hsieh 2016-06-22 23:05:59 +00:00 committed by android-build-merger
commit 3f646c24a9
4 changed files with 4 additions and 4 deletions

View file

@ -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

View file

@ -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)

View file

@ -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"

View file

@ -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)
{