Mon Aug 8 21:46:01 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com>

        * ace/OS_NS_time.inl:

          Fix some inconsistencies in the new android-specific wrappers.

        * ace/config-android.h:

          Android does not supply std::wstring

        * include/makeinclude/platform_linux_android.GNU:

          The android supplied compiler gives a preemptive warning about
          va_args mangling change, but I cannot find anything to change
          in the ACE code, so I added the recommended warning suppressor.

4 files changed, 30 insertions, 13 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 9656d4498b8..2e04f634235 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,19 @@
+Mon Aug  8 21:46:01 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/OS_NS_time.inl:
+
+          Fix some inconsistencies in the new android-specific wrappers.
+
+        * ace/config-android.h:
+
+          Android does not supply std::wstring
+
+        * include/makeinclude/platform_linux_android.GNU:
+
+          The android supplied compiler gives a preemptive warning about
+          va_args mangling change, but I cannot find anything to change
+          in the ACE code, so I added the recommended warning suppressor.
+
 Thu Aug  4 22:11:26 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * ace/config-android.h:
@@ -19,7 +35,7 @@ Thu Aug  4 15:03:16 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
           for Android using the Android Native Development Kit's standalone
           tool chain. http://developer.android.com/sdk/ndk/index.html
           Android is not a completely tested platform and automated testing
-          does not work for it currently. Thanks to Trevor Fields of OCI 
+          does not work for it currently. Thanks to Trevor Fields of OCI
           for doing the heavy lifting on preparing these changes.
 
         * examples/APG/ThreadManagement/Async_Cancel.cpp:
@@ -30,10 +46,10 @@ Thu Aug  4 15:03:16 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
         * examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp:
 
           Add wrappers necessary to get them working with Android.
-        
+
         * tests/Thread_Attrs_Test.cpp:
         * tests/test_config.h:
-        
+
           Minor changes for running tests on Android.
 
 Sun Jul 31 11:14:23 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl
index b348be5ca69..3842928979c 100644
--- a/ACE/ace/OS_NS_time.inl
+++ b/ACE/ace/OS_NS_time.inl
@@ -201,41 +201,41 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen)
 
 #if defined (ACE_USES_ULONG_FOR_STAT_TIME)
 ACE_INLINE ACE_TCHAR *
-ACE_OS::ctime (unsigned long *t)
+ACE_OS::ctime (const unsigned long *t)
 {
-  return ACE_OS::ctime (static_cast<time_t *>(t));
+  return ACE_OS::ctime (reinterpret_cast<const time_t *>(t));
 }
 
 ACE_INLINE ACE_TCHAR *
-ACE_OS::ctime_r (unsigned long *clock, ACE_TCHAR *buf, int buflen)
+ACE_OS::ctime_r (const unsigned long *clock, ACE_TCHAR *buf, int buflen)
 {
-  return ACE_OS::ctime_r (static_cast<time_t *>(clock), buf, buflen);
+  return ACE_OS::ctime_r (reinterpret_cast<const time_t *>(clock), buf, buflen);
 }
 
 ACE_INLINE struct tm *
 ACE_OS::gmtime (const unsigned long *clock)
 {
-  return ACE_OS::gmtime (static_cast<time_t *>(clock));
+  return ACE_OS::gmtime (reinterpret_cast<const time_t *>(clock));
 }
 
 ACE_INLINE struct tm *
 ACE_OS::gmtime_r (const unsigned long *clock,
                   struct tm *res)
 {
-  return ACE_OS::gmtime_r (static_cast<time_t *>(clock), res);
+  return ACE_OS::gmtime_r (reinterpret_cast<const time_t *>(clock), res);
 }
 
 ACE_INLINE struct tm *
 ACE_OS::localtime (const unsigned long *clock)
 {
-  return ACE_OS::localtime (static_cast<time_t *>(clock));
+  return ACE_OS::localtime (reinterpret_cast<const time_t *>(clock));
 }
 
 ACE_INLINE struct tm *
 ACE_OS::localtime_r (const unsigned long *clock,
                      struct tm *res)
 {
-  return ACE_OS::localtime_r (static_cast<time_t *>(clock), res);
+  return ACE_OS::localtime_r (reinterpret_cast<const time_t *>(clock), res);
 }
 
 
diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h
index d9a82f1e2e9..c2912f63227 100644
--- a/ACE/ace/config-android.h
+++ b/ACE/ace/config-android.h
@@ -44,6 +44,7 @@
 #define ACE_LACKS_SEEKDIR
 #define ACE_LACKS_SEMBUF_T
 #define ACE_LACKS_SETINHERITSCHED
+#define ACE_LACKS_STD_WSTRING
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SWAB
 #define ACE_LACKS_SYSV_SHMEM
diff --git a/ACE/include/makeinclude/platform_linux_android.GNU b/ACE/include/makeinclude/platform_linux_android.GNU
index b7647e0e0a7..9238d8d8be3 100644
--- a/ACE/include/makeinclude/platform_linux_android.GNU
+++ b/ACE/include/makeinclude/platform_linux_android.GNU
@@ -1,7 +1,7 @@
 # -*- Makefile -*-
 # $Id$
 
-# This file should allow ACE to be built for Android 2.3.1 (API Level 9) 
+# This file should allow ACE to be built for Android 2.3.1 (API Level 9)
 # or greater, by cross compiling on Linux.
 
 # The standalone gcc compilers in NDK r5c have issues with the visibility.
@@ -28,7 +28,7 @@ LDFLAGS += -Wl,--fix-cortex-a8
 
 CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version)
 
-FLAGS_C_CC += -W -Wall -Wpointer-arith
+FLAGS_C_CC += -W -Wall -Wpointer-arith -Wno-psabi
 ifeq ($(threads),1)
     CPPFLAGS  += -D_REENTRANT $(PLATFORM_AIO_SUPPORT)
 endif # threads