diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2016-05-16 12:36:42 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2016-05-16 12:36:42 -0700 |
| commit | 78e2c9c17f922cd2c8b3116fa6b228ea990d8f4b (patch) | |
| tree | 4da4d5f7c1d53c363c57fd71dca1d0588bfc1f21 | |
| parent | 63a8a6cd32d75857925fd54a2ecd173ddfa9322a (diff) | |
| parent | c9badf18c6b7ed62a4e0f997e62b716cca3b5db9 (diff) | |
| download | android_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
| -rw-r--r-- | libril/RilSapSocket.cpp | 6 | ||||
| -rwxr-xr-x | libril/ril.cpp | 4 | ||||
| -rw-r--r-- | reference-ril/atchannel.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libril/RilSapSocket.cpp b/libril/RilSapSocket.cpp index 19457f4..58b4f51 100644 --- a/libril/RilSapSocket.cpp +++ b/libril/RilSapSocket.cpp @@ -224,18 +224,18 @@ RilSapSocket::RilSapSocket(const char *socketName, #define BYTES_PER_LINE 16 #define NIBBLE_TO_HEX(n) ({ \ - uint8_t __n = (uint8_t) n & 0x0f; \ + uint8_t __n = (uint8_t) (n) & 0x0f; \ __nibble >= 10 ? 'A' + __n - 10: '0' + __n; \ }) #define HEX_HIGH(b) ({ \ - uint8_t __b = (uint8_t) b; \ + uint8_t __b = (uint8_t) (b); \ uint8_t __nibble = (__b >> 4) & 0x0f; \ NIBBLE_TO_HEX(__nibble); \ }) #define HEX_LOW(b) ({ \ - uint8_t __b = (uint8_t) b; \ + uint8_t __b = (uint8_t) (b); \ uint8_t __nibble = __b & 0x0f; \ NIBBLE_TO_HEX(__nibble); \ }) diff --git a/libril/ril.cpp b/libril/ril.cpp index c283eaf..dcc380e 100755 --- a/libril/ril.cpp +++ b/libril/ril.cpp @@ -92,8 +92,8 @@ namespace android { #define RESPONSE_UNSOLICITED_ACK_EXP 4 /* Negative values for private RIL errno's */ -#define RIL_ERRNO_INVALID_RESPONSE -1 -#define RIL_ERRNO_NO_MEMORY -12 +#define RIL_ERRNO_INVALID_RESPONSE (-1) +#define RIL_ERRNO_NO_MEMORY (-12) // request, response, and unsolicited msg print macro #define PRINTBUF_SIZE 8096 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 |