Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f646c24 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

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

am: 4a8ab167

Change-Id: I5ba2a6d0813eb728f5863801a36de6a012a8242a
parents 762dcdb1 4a8ab167

fastboot/engine.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

healthd/healthd_mode_charger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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)

init/util.h

+1 −1
Original line number Diff line number Diff line
@@ -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"

trusty/storage/tests/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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)

{