From 8feac89bc7329f002d3c4beba370d9c6ea05e798 Mon Sep 17 00:00:00 2001
From: dhewg
Date: Thu, 28 Apr 2011 20:02:01 +0200
Subject: ANDROID: Fix compilation some more

---
 backends/platform/android/android.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'backends/platform/android/android.cpp')

diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index bbfdb06b8d..c7f62f523b 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -32,6 +32,7 @@
 #include <unistd.h>
 
 #include "common/util.h"
+#include "common/textconsole.h"
 #include "common/rect.h"
 #include "common/queue.h"
 #include "common/mutex.h"
-- 
cgit v1.2.3


From 3d4e9fe674d2daf59ff4b481fc2f89f77b390a4f Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 3 May 2011 11:27:44 +0200
Subject: BACKENDS: Allow various files to use stuff from time.h

---
 backends/platform/android/android.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'backends/platform/android/android.cpp')

diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index c7f62f523b..7cf1e988fc 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -25,6 +25,9 @@
 
 #if defined(__ANDROID__)
 
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/system_properties.h>
-- 
cgit v1.2.3


From a50c36d1381be2e7d0748a2c734e41357fd4920f Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 3 May 2011 14:29:01 +0200
Subject: ANDROID: Fix various forbidden symbol clashes

---
 backends/platform/android/android.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'backends/platform/android/android.cpp')

diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 7cf1e988fc..b1d0727d1f 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -28,6 +28,20 @@
 // Allow use of stuff in <time.h>
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 
+// Disable printf override in common/forbidden.h to avoid
+// clashes with log.h from the Android SDK.
+// That header file uses
+//   __attribute__ ((format(printf, 3, 4)))
+// which gets messed up by our override mechanism; this could
+// be avoided by either changing the Android SDK to use the equally
+// legal and valid
+//   __attribute__ ((format(printf, 3, 4)))
+// or by refining our printf override to use a varadic macro
+// (which then wouldn't be portable, though).
+// Anyway, for now we just disable the printf override globally
+// for the Android port
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/system_properties.h>
-- 
cgit v1.2.3