From ad95b98c568e6b7dfdb21a57399ec847cd42b6ac Mon Sep 17 00:00:00 2001
From: Alexander Tarasikov <alexander.tarasikov@gmail.com>
Date: Mon, 23 Jul 2012 17:46:45 +0400
Subject: Fix compilation on jellybean

---
 samsung-ril.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'samsung-ril.h')

diff --git a/samsung-ril.h b/samsung-ril.h
index f6db9d8..acb5077 100644
--- a/samsung-ril.h
+++ b/samsung-ril.h
@@ -27,6 +27,20 @@
 #include <telephony/ril.h>
 #include <radio.h>
 
+#include <cutils/log.h>
+
+#ifndef LOGE
+	#define LOGE ALOGE
+#endif
+
+#ifndef LOGI
+	#define LOGI ALOGI
+#endif
+
+#ifndef LOGD
+	#define LOGD ALOGD
+#endif
+
 #include "ipc.h"
 #include "srs.h"
 
-- 
cgit v1.1


From 49e342a59445280241298d273ca8aa3358f12587 Mon Sep 17 00:00:00 2001
From: Alexander Tarasikov <alexander.tarasikov@gmail.com>
Date: Wed, 25 Jul 2012 11:23:02 +0400
Subject: Fix some compilation warnings

---
 samsung-ril.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'samsung-ril.h')

diff --git a/samsung-ril.h b/samsung-ril.h
index acb5077..d94d583 100644
--- a/samsung-ril.h
+++ b/samsung-ril.h
@@ -27,7 +27,7 @@
 #include <telephony/ril.h>
 #include <radio.h>
 
-#include <cutils/log.h>
+#include <utils/Log.h>
 
 #ifndef LOGE
 	#define LOGE ALOGE
@@ -276,6 +276,7 @@ void ril_request_enter_sim_pin(RIL_Token t, void *data, size_t datalen);
 void ril_request_change_sim_pin(RIL_Token t, void *data, size_t datalen);
 void ril_request_enter_sim_puk(RIL_Token t, void *data, size_t datalen);
 void ril_request_query_facility_lock(RIL_Token t, void *data, size_t datalen);
+void ipc_sec_phone_lock(struct ipc_message_info *info);
 void ipc_sec_phone_lock_complete(struct ipc_message_info *info);
 void ril_request_set_facility_lock(RIL_Token t, void *data, size_t datalen);
 
-- 
cgit v1.1


From 6e6ad0dd8a929d6816284dccce13898c4a30fbe5 Mon Sep 17 00:00:00 2001
From: Alexander Tarasikov <alexander.tarasikov@gmail.com>
Date: Thu, 23 Aug 2012 01:21:52 +0400
Subject: Add the compat.h header to multiple Android trees

---
 samsung-ril.h | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'samsung-ril.h')

diff --git a/samsung-ril.h b/samsung-ril.h
index d94d583..b0e46e4 100644
--- a/samsung-ril.h
+++ b/samsung-ril.h
@@ -27,20 +27,7 @@
 #include <telephony/ril.h>
 #include <radio.h>
 
-#include <utils/Log.h>
-
-#ifndef LOGE
-	#define LOGE ALOGE
-#endif
-
-#ifndef LOGI
-	#define LOGI ALOGI
-#endif
-
-#ifndef LOGD
-	#define LOGD ALOGD
-#endif
-
+#include "compat.h"
 #include "ipc.h"
 #include "srs.h"
 
-- 
cgit v1.1