commit 78e2c9c17f922cd2c8b3116fa6b228ea990d8f4b
author Robert Greenwalt <rgreenwalt@google.com> Mon May 16 12:36:42 2016 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Mon May 16 12:36:42 2016 -0700
tree 4da4d5f7c1d53c363c57fd71dca1d0588bfc1f21
parent 63a8a6cd32d75857925fd54a2ecd173ddfa9322a
parent c9badf18c6b7ed62a4e0f997e62b716cca3b5db9

resolve merge conflicts of c9badf1 to nyc-dev-plus-aosp

Change-Id: I59d138a61554a2439577bcfdf400ea663c6bb91d

libril/ril.cpp

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