Added cout/cerr that output to Android log to STLPort, fixed broken compilation for NDK r4b

2010-12-21 14:29:52 +00:00
parent 4d16a4dc88
commit ea051bb11f
5 changed files with 121 additions and 4 deletions
--- a/project/jni/stlport/src/locale_impl.cpp
+++ b/project/jni/stlport/src/locale_impl.cpp
@@ -579,7 +579,9 @@ static locale* _Stl_get_global_locale() {
 #  pragma init_seg(lib)
 #endif

+#if !defined(ANDROID) && !defined(__ANDROID__)
 static ios_base::Init _IosInit;
+#endif

 void _Locale_impl::make_classic_locale() {
  // This funcion will be called once: during build classic _Locale_impl