summaryrefslogtreecommitdiffstats
path: root/reference-ril/atchannel.c
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2016-05-16 12:36:42 -0700
committerRobert Greenwalt <rgreenwalt@google.com>2016-05-16 12:36:42 -0700
commit78e2c9c17f922cd2c8b3116fa6b228ea990d8f4b (patch)
tree4da4d5f7c1d53c363c57fd71dca1d0588bfc1f21 /reference-ril/atchannel.c
parent63a8a6cd32d75857925fd54a2ecd173ddfa9322a (diff)
parentc9badf18c6b7ed62a4e0f997e62b716cca3b5db9 (diff)
downloadandroid_hardware_ril-78e2c9c17f922cd2c8b3116fa6b228ea990d8f4b.tar.gz
android_hardware_ril-78e2c9c17f922cd2c8b3116fa6b228ea990d8f4b.tar.bz2
android_hardware_ril-78e2c9c17f922cd2c8b3116fa6b228ea990d8f4b.zip
resolve merge conflicts of c9badf1 to nyc-dev-plus-aosp
Change-Id: I59d138a61554a2439577bcfdf400ea663c6bb91d
Diffstat (limited to 'reference-ril/atchannel.c')
-rw-r--r--reference-ril/atchannel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/reference-ril/atchannel.c b/reference-ril/atchannel.c
index 6124d88..84e8c37 100644
--- a/reference-ril/atchannel.c
+++ b/reference-ril/atchannel.c
@@ -36,7 +36,7 @@
#include "misc.h"
-#define NUM_ELEMS(x) (sizeof(x)/sizeof(x[0]))
+#define NUM_ELEMS(x) (sizeof(x)/sizeof((x)[0]))
#define MAX_AT_RESPONSE (8 * 1024)
#define HANDSHAKE_RETRY_COUNT 8