From 3496cc699022cc094767e9f0fd6c53594dedc018 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Sun, 12 Jun 2011 19:26:28 +0300
Subject: [android] Fixes for static lib toolchain support

---
 std/iostream.hpp  | 2 ++
 std/stdint.hpp    | 2 +-
 std/string.hpp    | 2 +-
 std/target_os.hpp | 6 +++++-
 4 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'std')

diff --git a/std/iostream.hpp b/std/iostream.hpp
index 1fe50b369f..7e56b9e9b2 100644
--- a/std/iostream.hpp
+++ b/std/iostream.hpp
@@ -16,9 +16,11 @@
 using std::cin;
 using std::cout;
 using std::cerr;
+#ifndef OMIM_OS_ANDROID
 using std::wcin;
 using std::wcout;
 using std::wcerr;
+#endif
 #endif  // OMIM_OS_BADA
 
 using std::endl;
diff --git a/std/stdint.hpp b/std/stdint.hpp
index d679ba5e7f..7f444a3ceb 100644
--- a/std/stdint.hpp
+++ b/std/stdint.hpp
@@ -16,7 +16,7 @@
   typedef unsigned __int32  uint32_t;
   typedef unsigned __int64  uint64_t;
 
-#elif defined(OMIM_OS_BADA)
+#elif defined(OMIM_OS_BADA) || defined(OMIM_OS_ANDROID)
   #include <stdint.h>
 
 #else
diff --git a/std/string.hpp b/std/string.hpp
index 675fee5fe3..0cdd70eda6 100644
--- a/std/string.hpp
+++ b/std/string.hpp
@@ -12,7 +12,7 @@ using std::basic_string;
 using std::string;
 using std::getline;
 
-#ifdef OMIM_OS_BADA
+#if defined(OMIM_OS_BADA) || defined(OMIM_OS_ANDROID)
 typedef std::basic_string<wchar_t> wstring;
 #else
 using std::wstring;
diff --git a/std/target_os.hpp b/std/target_os.hpp
index 8830773ade..0587a78f09 100644
--- a/std/target_os.hpp
+++ b/std/target_os.hpp
@@ -1,6 +1,10 @@
 #pragma once
 
-#if defined(_BADA_SIMULATOR) || defined(_BADA_DEVICE)
+#if defined(ANDROID)
+  #define OMIM_OS_ANDROID
+  #define OMIM_OS_NAME "android"
+
+#elif defined(_BADA_SIMULATOR) || defined(_BADA_DEVICE)
   #define OMIM_OS_BADA
   #define OMIM_OS_NAME "bada"
 
-- 
cgit v1.2.3