Wed Sep 11 07:50:50 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/MEM_Addr.h:
        * ace/MEM_Connector.cpp:
        * ace/OS_NS_Thread.cpp:
        * ace/README:
        * ace/Service_Config.cpp:
        * ace/config-android.h:
        * ace/config-hpux-11.00.h:
        * ace/config-kfreebsd.h:
        * ace/config-linux.h:
        * ace/config-macosx.h:
        * ace/config-netbsd.h:
        * ace/config-qnx.h:
        * ace/config-vxworks6.4.h:
        * bin/PerlACE/ProcessAndroid.pm:
        * bin/PerlACE/TestTarget_Android.pm:
        * tests/Bug_3912_Regression_Test.cpp:
        * tests/Compiler_Features_21_Test.cpp:
        * tests/MEM_Stream_Test.cpp:
        * tests/Malloc_Test.cpp:
        * tests/Process_Mutex_Test.cpp:
        * tests/Process_Test.cpp:
        * tests/Service_Config_Test.cpp:
        * tests/test_config.h:
          Improvements for the Android port

          commit 496976474caeddb893be839386f204f46e5965d7
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Tue Sep 10 10:02:38 2013 +0200

                    Comment out ACE_HAS_POSIX_SEM, have to test this
further
                  * ACE/ace/config-android.h:

          commit 5a8318253f6f8647b4db2842a3503481e043e2fb
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 20:55:12 2013 +0200

                    Layout changes
                  * ACE/ace/README:

          commit cb35f2c6d6e59614ecfaf60ccd996c68d90d0d56
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 15:17:44 2013 +0200

                    Use quotes around filenames in order to support
spaces
                    as part of filename
                  * ACE/bin/PerlACE/ProcessAndroid.pm:
                  * ACE/bin/PerlACE/TestTarget_Android.pm:

          commit 29efbb9f20501f2ba553b9b2d73cebe03776e470
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 15:17:23 2013 +0200

                    Fixed compile error
                  * ACE/tests/Malloc_Test.cpp:

          commit 9a4e55c673fd2b5dfa023f1ca0979e052f646783
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 14:48:37 2013 +0200

                    Doxygen changes and improved logging
                  * ACE/ace/MEM_Addr.h:
                  * ACE/ace/MEM_Connector.cpp:
                  * ACE/tests/MEM_Stream_Test.cpp:

          commit bfb51ada525d6aedd1c992a353ce875804417a09
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 14:39:41 2013 +0200

                    layout change
                  * ACE/tests/Process_Test.cpp:

          commit 4ac9f871f71bf40dc589d30868c66598a8cded43
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 14:39:23 2013 +0200

                    Add more logging
                  * ACE/tests/Bug_3912_Regression_Test.cpp:

          commit b6becedd263028b68853fba7de8a232c8f9a3c62
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 13:47:24 2013 +0200

                    Android also can't hnadle mmap from the signal
handler
                  * ACE/tests/Malloc_Test.cpp:

          commit bd11f9f77184f9cd988aea0b214dd67b98a4245f
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 13:47:08 2013 +0200

                    Added ACE_ANDROID
                  * ACE/ace/config-android.h:

          commit 8bb25df4c6ae1969c90297a7a36a549701c7295a
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 13:39:56 2013 +0200

                    Layout change
                  * ACE/tests/Process_Mutex_Test.cpp:

          commit 4cd46bb07480c0c2038360ef7c76da21672d481f
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 13:39:36 2013 +0200

                    Use full paths, added more logging
                  * ACE/tests/Service_Config_Test.cpp:

          commit fef201da28f786ec93110ed03b66e4996d5cdde9
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 13:39:07 2013 +0200

                    Fixed typo in message
                  * ACE/tests/test_config.h:

          commit 705787197e4b934ae6a2fe57ae0533d68f4b2e56
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 13:38:45 2013 +0200

                    Check return of daemonize
                  * ACE/ace/Service_Config.cpp:

          commit 71c63afb20484344f7c3559c3c0bfb3c0b92eab3
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 12:46:39 2013 +0200

                    Further cleanup of the config files
                  * ACE/ace/config-android.h:
                  * ACE/ace/config-kfreebsd.h:
                  * ACE/ace/config-macosx.h:
                  * ACE/ace/config-netbsd.h:

          commit c471940cd808a7240f1661940aad83bb82dd6dc9
          Author: Johnny Willemsen <jwillemsen@remedy.nl>
          Date:   Mon Sep 9 11:39:51 2013 +0200

                    Introduced ACE_LACKSP_THREAD_SCOPE_PROCESS and
                    simplified OS_NS_Thread.cpp by using this new
                    define. Set it also for android from now
                  * ACE/ace/OS_NS_Thread.cpp:
                  * ACE/ace/README:
                  * ACE/ace/config-android.h:
                  * ACE/ace/config-hpux-11.00.h:
                  * ACE/ace/config-linux.h:
                  * ACE/ace/config-qnx.h:
                  * ACE/ace/config-vxworks6.4.h:

24 files changed, 289 insertions, 103 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 92339ca4259..911becf8616 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,150 @@
+Wed Sep 11 07:50:50 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/MEM_Addr.h:
+        * ace/MEM_Connector.cpp:
+        * ace/OS_NS_Thread.cpp:
+        * ace/README:
+        * ace/Service_Config.cpp:
+        * ace/config-android.h:
+        * ace/config-hpux-11.00.h:
+        * ace/config-kfreebsd.h:
+        * ace/config-linux.h:
+        * ace/config-macosx.h:
+        * ace/config-netbsd.h:
+        * ace/config-qnx.h:
+        * ace/config-vxworks6.4.h:
+        * bin/PerlACE/ProcessAndroid.pm:
+        * bin/PerlACE/TestTarget_Android.pm:
+        * tests/Bug_3912_Regression_Test.cpp:
+        * tests/Compiler_Features_21_Test.cpp:
+        * tests/MEM_Stream_Test.cpp:
+        * tests/Malloc_Test.cpp:
+        * tests/Process_Mutex_Test.cpp:
+        * tests/Process_Test.cpp:
+        * tests/Service_Config_Test.cpp:
+        * tests/test_config.h:
+          Improvements for the Android port
+
+          commit 496976474caeddb893be839386f204f46e5965d7
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Tue Sep 10 10:02:38 2013 +0200
+
+                    Comment out ACE_HAS_POSIX_SEM, have to test this further
+                  * ACE/ace/config-android.h:
+
+          commit 5a8318253f6f8647b4db2842a3503481e043e2fb
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Mon Sep 9 20:55:12 2013 +0200
+
+                    Layout changes
+                  * ACE/ace/README:
+
+          commit cb35f2c6d6e59614ecfaf60ccd996c68d90d0d56
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Mon Sep 9 15:17:44 2013 +0200
+
+                    Use quotes around filenames in order to support spaces
+                    as part of filename
+                  * ACE/bin/PerlACE/ProcessAndroid.pm:
+                  * ACE/bin/PerlACE/TestTarget_Android.pm:
+
+          commit 29efbb9f20501f2ba553b9b2d73cebe03776e470
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Mon Sep 9 15:17:23 2013 +0200
+
+                    Fixed compile error
+                  * ACE/tests/Malloc_Test.cpp:
+
+          commit 9a4e55c673fd2b5dfa023f1ca0979e052f646783
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Mon Sep 9 14:48:37 2013 +0200
+
+                    Doxygen changes and improved logging
+                  * ACE/ace/MEM_Addr.h:
+                  * ACE/ace/MEM_Connector.cpp:
+                  * ACE/tests/MEM_Stream_Test.cpp:
+
+          commit bfb51ada525d6aedd1c992a353ce875804417a09
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Mon Sep 9 14:39:41 2013 +0200
+
+                    layout change
+                  * ACE/tests/Process_Test.cpp:
+
+          commit 4ac9f871f71bf40dc589d30868c66598a8cded43
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Mon Sep 9 14:39:23 2013 +0200
+
+                    Add more logging
+                  * ACE/tests/Bug_3912_Regression_Test.cpp:
+
+          commit b6becedd263028b68853fba7de8a232c8f9a3c62
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Mon Sep 9 13:47:24 2013 +0200
+
+                    Android also can't hnadle mmap from the signal handler
+                  * ACE/tests/Malloc_Test.cpp:
+
+          commit bd11f9f77184f9cd988aea0b214dd67b98a4245f
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Mon Sep 9 13:47:08 2013 +0200
+
+                    Added ACE_ANDROID
+                  * ACE/ace/config-android.h:
+
+          commit 8bb25df4c6ae1969c90297a7a36a549701c7295a
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Mon Sep 9 13:39:56 2013 +0200
+
+                    Layout change
+                  * ACE/tests/Process_Mutex_Test.cpp:
+
+          commit 4cd46bb07480c0c2038360ef7c76da21672d481f
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Mon Sep 9 13:39:36 2013 +0200
+
+                    Use full paths, added more logging
+                  * ACE/tests/Service_Config_Test.cpp:
+
+          commit fef201da28f786ec93110ed03b66e4996d5cdde9
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Mon Sep 9 13:39:07 2013 +0200
+
+                    Fixed typo in message
+                  * ACE/tests/test_config.h:
+
+          commit 705787197e4b934ae6a2fe57ae0533d68f4b2e56
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Mon Sep 9 13:38:45 2013 +0200
+
+                    Check return of daemonize
+                  * ACE/ace/Service_Config.cpp:
+
+          commit 71c63afb20484344f7c3559c3c0bfb3c0b92eab3
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Mon Sep 9 12:46:39 2013 +0200
+
+                    Further cleanup of the config files
+                  * ACE/ace/config-android.h:
+                  * ACE/ace/config-kfreebsd.h:
+                  * ACE/ace/config-macosx.h:
+                  * ACE/ace/config-netbsd.h:
+
+          commit c471940cd808a7240f1661940aad83bb82dd6dc9
+          Author: Johnny Willemsen <jwillemsen@remedy.nl>
+          Date:   Mon Sep 9 11:39:51 2013 +0200
+
+                    Introduced ACE_LACKSP_THREAD_SCOPE_PROCESS and
+                    simplified OS_NS_Thread.cpp by using this new
+                    define. Set it also for android from now
+                  * ACE/ace/OS_NS_Thread.cpp:
+                  * ACE/ace/README:
+                  * ACE/ace/config-android.h:
+                  * ACE/ace/config-hpux-11.00.h:
+                  * ACE/ace/config-linux.h:
+                  * ACE/ace/config-qnx.h:
+                  * ACE/ace/config-vxworks6.4.h:
+
 Fri Sep  6 12:35:04 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Compiler_Features_23_Test.cpp:
diff --git a/ACE/ace/MEM_Addr.h b/ACE/ace/MEM_Addr.h
index 687c421443c..0adcf677308 100644
--- a/ACE/ace/MEM_Addr.h
+++ b/ACE/ace/MEM_Addr.h
@@ -71,7 +71,7 @@ public:
   int set (u_short port_number, int encode = 1);
 
   /// Uses <getservbyname> to initialize an ACE_MEM_Addr from a
-  /// <port_name>, the remote <host_name>, and the <protocol>.
+  /// @a port_name, the remote <host_name>, and the <protocol>.
   int set (const ACE_TCHAR port_name[]);
 
   /// Return a pointer to the underlying network address.
diff --git a/ACE/ace/MEM_Connector.cpp b/ACE/ace/MEM_Connector.cpp
index 0230bd2d1b0..0635ce07c3f 100644
--- a/ACE/ace/MEM_Connector.cpp
+++ b/ACE/ace/MEM_Connector.cpp
@@ -1,10 +1,7 @@
-// MEM_Connector.cpp
 // $Id$
 
 #include "ace/MEM_Connector.h"
 
-
-
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
 #if !defined (__ACE_INLINE__)
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index 9fec2eae63a..61cbd215bd5 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -4126,14 +4126,11 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
       if (ACE_BIT_ENABLED (flags, THR_SCOPE_SYSTEM)
           || ACE_BIT_ENABLED (flags, THR_SCOPE_PROCESS))
         {
-#     if defined (ACE_CONFIG_LINUX_H) || defined (HPUX) || defined (ACE_VXWORKS) || defined (__QNX__)
-          // LinuxThreads do not have support for PTHREAD_SCOPE_PROCESS.
-          // Neither does HPUX (up to HP-UX 11.00, as far as I know).
-          // Also VxWorks only delivers scope system
+#     if defined (ACE_LACKS_PTHREAD_SCOPE_PROCESS)
           int scope = PTHREAD_SCOPE_SYSTEM;
-#     else /* ACE_CONFIG_LINUX_H */
+#     else /* ACE_LACKS_PTHREAD_SCOPE_PROCESS */
           int scope = PTHREAD_SCOPE_PROCESS;
-#     endif /* ACE_CONFIG_LINUX_H */
+#     endif /* ACE_LACKS_PTHREAD_SCOPE_PROCESS */
           if (ACE_BIT_ENABLED (flags, THR_SCOPE_SYSTEM))
             scope = PTHREAD_SCOPE_SYSTEM;
 
diff --git a/ACE/ace/README b/ACE/ace/README
index 4a5b989f807..ec35f802b69 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -473,7 +473,7 @@ ACE_HAS_PTHREADS                        Platform supports POSIX
 ACE_HAS_PTHREADS_UNIX98_EXT             Platform has the UNIX98 extensions to
                                         Pthreads (rwlocks)
 ACE_HAS_PTHREAD_ATTR_SETCREATESUSPEND_NP  Platform has
-					pthread_attr_setcreatesuspend_np().
+                                        pthread_attr_setcreatesuspend_np().
 ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP     Platform has pthread_condattr_setkind_np().
 ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP    Platform has
                                         pthread_mutexattr_setkind_np().
@@ -536,10 +536,10 @@ ACE_HAS_SIG_C_FUNC                      Compiler requires extern "C"
 ACE_HAS_SIZET_SOCKET_LEN                OS/compiler uses size_t *
                                         rather than int * for socket
                                         lengths
-ACE_HAS_SOCKADDR_IN_SIN_LEN		Platform has sin_len member in struct
-					sockaddr_in.
-ACE_HAS_SOCKADDR_IN6_SIN_LEN		Platform has sin6_len member in struct
-					sockaddr_in6.
+ACE_HAS_SOCKADDR_IN_SIN_LEN             Platform has sin_len member in struct
+                                        sockaddr_in.
+ACE_HAS_SOCKADDR_IN6_SIN_LEN            Platform has sin6_len member in struct
+                                        sockaddr_in6.
 ACE_HAS_SOCKADDR_MSG_NAME               Platform requires (struct
                                         sockaddr *) for msg_name field
                                         of struct msghdr.
@@ -563,13 +563,13 @@ ACE_HAS_STDCPP_STL_INCLUDES             Standard C++ headers can be
 ACE_HAS_STRBUF_T                        Compiler/platform supports
                                         struct strbuf
 ACE_HAS_STRDUP_EMULATION                Use ACE's strdup() emulation (even
-					if platform has a native strdup()).
-				        This is useful if you need control
-					over what memory allocator is used.
+                                        if platform has a native strdup()).
+                                        This is useful if you need control
+                                        over what memory allocator is used.
 ACE_HAS_WCSDUP_EMULATION                Use ACE's wcsdup() emulation (even
-					if platform has a native wcsdup()).
-				        This is useful if you need control
-					over what memory allocator is used.
+                                        if platform has a native wcsdup()).
+                                        This is useful if you need control
+                                        over what memory allocator is used.
 ACE_HAS_STRNLEN                         Platform supports strnlen(3).
 ACE_HAS_STREAMS                         Platform supports STREAMS
 ACE_HAS_STREAM_PIPES                    Platform supports STREAM pipes
@@ -692,9 +692,9 @@ ACE_HAS_VERSIONED_NAMESPACE             Wrap all library code within a
                                         ACE_VERSIONED_NAMESPACE_NAME
                                         to desired name.
 ACE_LACKS_INTMAX_T                      Platform lacks the intmax_t type
-ACE_LACKS_UINTMAX_T			Platform lacks the uintmax_t type.
+ACE_LACKS_UINTMAX_T                     Platform lacks the uintmax_t type.
 ACE_LACKS_INTPTR_T                      Platform lacks the intptr_t type
-ACE_LACKS_UINTPTR_T			Platform lacks the uintptr_t type.
+ACE_LACKS_UINTPTR_T                     Platform lacks the uintptr_t type.
 
 ACE_HAS_INT8_T                          Platform provides the int8_t type.
 ACE_HAS_INT16_T                         Platform provides the int16_t type.
@@ -889,7 +889,7 @@ ACE_LACKS_MKTEMP                        Platform lacks the mktemp() function.
 ACE_LACKS_MKTEMP_PROTOTYPE              Platform/compiler lacks the
                                         mktemp() prototype (e.g.,
                                         LynxOS)
-ACE_LACKS_MKSTEMP			Platform lacks the mkstemp() function.
+ACE_LACKS_MKSTEMP      Platform lacks the mkstemp() function.
 ACE_LACKS_MKSTEMP_PROTOTYPE             Platform/compiler lacks the
                                         mkstemp() prototype (e.g.,
                                         LynxOS)
@@ -924,7 +924,7 @@ ACE_LACKS_NEW_H                         OS doesn't have, or we don't want to
                                         use, new.h.
 ACE_LACKS_NULL_PTHREAD_STATUS           OS requires non-null status pointer
                                         for ::pthread_join ().
-ACE_LACKS_NUMERIC_LIMITS		Platform lacks std::numeric_limits<>.
+ACE_LACKS_NUMERIC_LIMITS    Platform lacks std::numeric_limits<>.
 ACE_LACKS_PERFECT_MULTICAST_FILTERING   Platform lacks IGMPv3 "perfect" filtering
                                         of multicast dgrams at the socket level.
                                         If == 1, ACE_SOCK_Dgram_Mcast will bind
@@ -936,6 +936,8 @@ ACE_LACKS_PRI_T                         Platform lacks pri_t (e.g.,
                                         Tandem NonStop UNIX).
 ACE_LACKS_PTHREAD_CANCEL                Platform lacks
                                         pthread_cancel().
+ACE_LACKS_PTHREAD_SCOPE_PROCESS         Platform lacks support for
+                                        PTHREAD_SCOPE_PROCESS
 ACE_LACKS_PTHREAD_SIGMASK               Platform lacks pthread_sigmask ().
 ACE_LACKS_PTHREAD_THR_SIGSETMASK        Platform lacks
                                         pthread_thr_sigsetmask (e.g.,
@@ -995,9 +997,9 @@ ACE_LACKS_SIGSET                        Platform lacks signal sets
                                         (e.g., Chorus and Win32)
 ACE_LACKS_STRPTIME                      Platform/compiler lacks the strptime()
                                         function.
-ACE_LACKS_WCSCHR			Platform/compiler lacks wcschr()
-ACE_LACKS_STRDUP			Platform/compiler lacks strdup()
-ACE_LACKS_WCSDUP			Platform/compiler lacks wcsdup()
+ACE_LACKS_WCSCHR                        Platform/compiler lacks wcschr()
+ACE_LACKS_STRDUP                        Platform/compiler lacks strdup()
+ACE_LACKS_WCSDUP                        Platform/compiler lacks wcsdup()
 ACE_LACKS_STRRCHR                       Platform/compiler lacks strrchr()
 ACE_LACKS_WCSRCHR                       Platform/compiler lacks wcsrchr()
 ACE_LACKS_SWAB                          Platform/compiler lacks
@@ -1045,17 +1047,17 @@ ACE_LACKS_TELLDIR                       Platform uses ACE_HAS_DIRENT
 ACE_LACKS_THREAD_STACK_SIZE             Platform lacks
                                         pthread_attr_setstacksize()
                                         (e.g., Linux pthreads)
-ACE_LACKS_THR_CONCURRENCY_FUNCS		(ONLY APPLIES TO SOLARIS)
-					Platform does not support
-					thr_getconcurrency/thr_setconcurrency
-					functions, or their implementation
-					is effectively a "no-op".  This
-					notably applies for Solaris >= 5.9.
-					Note that if you build on Solaris 8
-					and run on Solaris 9+, you can
-					encounter thread creation errors
-					unless you rebuild on the target
-					platform.
+ACE_LACKS_THR_CONCURRENCY_FUNCS    (ONLY APPLIES TO SOLARIS)
+                                        Platform does not support
+                                        thr_getconcurrency/thr_setconcurrency
+                                        functions, or their implementation
+                                        is effectively a "no-op".  This
+                                        notably applies for Solaris >= 5.9.
+                                        Note that if you build on Solaris 8
+                                        and run on Solaris 9+, you can
+                                        encounter thread creation errors
+                                        unless you rebuild on the target
+                                        platform.
 ACE_LACKS_TIMEDWAIT_PROTOTYPES          MIT pthreads platform lacks
                                         the timedwait prototypes
 ACE_LACKS_TIMESPEC_T                    Platform does not define
diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp
index 1f8166738c7..be9babf004f 100644
--- a/ACE/ace/Service_Config.cpp
+++ b/ACE/ace/Service_Config.cpp
@@ -244,7 +244,12 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[],
 
   // Become a daemon before doing anything else.
   if (ACE_Service_Config::be_a_daemon_)
-    ACE::daemonize ();
+    {
+      // If we have to become a daemn and that fails
+      // return -1 here
+      if (ACE::daemonize () == -1)
+        return -1;
+    }
 
   // Write process id to file.
   if (this->pid_file_name_ != 0)
diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h
index 35a01d161e4..9ccb4cafb0f 100644
--- a/ACE/ace/config-android.h
+++ b/ACE/ace/config-android.h
@@ -16,6 +16,8 @@
 # error __ANDROID_API__ must be defined
 #endif
 
+#define ACE_ANDROID
+
 #define ACE_HAS_SSIZE_T
 
 // system errorno is a volatile int
@@ -85,34 +87,13 @@
 // Needed to differentiate between libc 5 and libc 6 (aka glibc).
 #include <features.h>
 
-#if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500)
-#  define ACE_HAS_PTHREADS_UNIX98_EXT
-#endif /* _XOPEN_SOURCE - 0 >= 500 */
-
-# include "ace/config-posix.h"
-
-#if !defined (ACE_LACKS_LINUX_NPTL)
-
-  // Temporary fix because NPTL kernels do have shm_open but there is a problem
-  // with shm_open/shm_unlink pairing in ACE which needs to be fixed when I have time.
-# if defined (ACE_HAS_SHM_OPEN)
-#   undef ACE_HAS_SHM_OPEN
-# endif /* ACE_HAS_SHM_OPEN */
+#define ACE_HAS_PTHREADS_UNIX98_EXT
 
-# if defined (ACE_USES_FIFO_SEM)
-    // Don't use this for Linux NPTL since this has complete
-    // POSIX semaphores which are more efficient
-#   undef ACE_USES_FIFO_SEM
-# endif /* ACE_USES_FIFO_SEM */
+#include "ace/config-posix.h"
 
-# if defined (ACE_HAS_POSIX_SEM)
-    // Linux NPTL may not define the right POSIX macro
-    // but they have the actual runtime support for this stuff
-#   if !defined (ACE_HAS_POSIX_SEM_TIMEOUT) && (((_POSIX_C_SOURCE - 0) >= 200112L) || (_XOPEN_SOURCE >= 600))
-#     define ACE_HAS_POSIX_SEM_TIMEOUT
-#   endif /* !ACE_HAS_POSIX_SEM_TIMEOUT && (((_POSIX_C_SOURCE - 0) >= 200112L) || (_XOPEN_SOURCE >= 600)) */
-# endif /* ACE_HAS_POSIX_SEM */
-#endif /* !ACE_LACKS_LINUX_NPTL */
+// @todo JW, test if this works
+// #define ACE_HAS_POSIX_SEM
+// #define ACE_HAS_POSIX_SEM_TIMEOUT
 
 // AIO support pulls in the rt library, which pulls in the pthread
 // library.  Disable AIO in single-threaded builds.
@@ -123,17 +104,10 @@
 #endif
 
 // First the machine specific part
-
 #if defined (__powerpc__) || defined (__x86_64__)
 # if !defined (ACE_DEFAULT_BASE_ADDR)
 #   define ACE_DEFAULT_BASE_ADDR ((char *) 0x40000000)
 # endif /* ! ACE_DEFAULT_BASE_ADDR */
-#elif defined (__ia64)
-# if !defined (ACE_DEFAULT_BASE_ADDR)
-// Zero base address should work fine for Linux of IA-64: it just lets
-// the kernel to choose the right value.
-#   define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000000000000000)
-# endif /* ! ACE_DEFAULT_BASE_ADDR */
 #endif /* ! __powerpc__  && ! __ia64 */
 
 #define ACE_HAS_SIGINFO_T
@@ -299,11 +273,6 @@
 
 #define ACE_SIZEOF_WCHAR 4
 
-#if defined (__powerpc__) && !defined (ACE_SIZEOF_LONG_DOUBLE)
-// 32bit PowerPC Linux uses 128bit long double
-# define ACE_SIZEOF_LONG_DOUBLE 16
-#endif
-
 // Platform has POSIX terminal interface.
 #define ACE_HAS_TERMIOS
 
@@ -314,6 +283,8 @@
 
 #define ACE_HAS_VASPRINTF
 
+#define ACE_LACKS_PTHREAD_SCOPE_PROCESS
+
 // According to man pages Linux uses different (compared to UNIX systems) types
 // for setting IP_MULTICAST_TTL and IPV6_MULTICAST_LOOP / IP_MULTICAST_LOOP
 // in setsockopt/getsockopt.
@@ -363,7 +334,9 @@
 # define ACE_LACKS_GETIPNODEBYNAME
 #endif
 
-#if __ANDROID_API__ == 8
+#if __ANDROID_API__ == 3
+# error Unsupported Android release 3
+#elif __ANDROID_API__ == 8
 # define ACE_LACKS_REGEX_H 1
 # define ACE_LACKS_CONDATTR 1
 #elif __ANDROID_API__ == 9
diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h
index 505f703434f..fba8bedd37f 100644
--- a/ACE/ace/config-hpux-11.00.h
+++ b/ACE/ace/config-hpux-11.00.h
@@ -167,6 +167,8 @@
 #define ACE_LACKS_CLOCK_MONOTONIC
 #define ACE_LACKS_MONOTONIC_TIME
 
+#define ACE_LACKS_PTHREAD_SCOPE_PROCESS
+
 // Prototypes for both signal() and struct sigaction are consistent.
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 
diff --git a/ACE/ace/config-kfreebsd.h b/ACE/ace/config-kfreebsd.h
index 1640003707e..2dc0a7c608a 100644
--- a/ACE/ace/config-kfreebsd.h
+++ b/ACE/ace/config-kfreebsd.h
@@ -290,7 +290,7 @@
 #define ACE_HAS_SYSCTL 1
 
 /* Platform supports System V IPC (most versions of UNIX, but not Win32) */
-#define ACE_HAS_SYSV_IPC 1
+#define ACE_HAS_SYSV_IPC
 
 /* Platform/compiler supports _sys_errlist symbol */
 #define ACE_HAS_SYS_ERRLIST 1
diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h
index 014ad53e23f..438c9f5cd04 100644
--- a/ACE/ace/config-linux.h
+++ b/ACE/ace/config-linux.h
@@ -324,6 +324,8 @@
 # define ACE_SIZEOF_LONG_DOUBLE 16
 #endif
 
+#define ACE_LACKS_PTHREAD_SCOPE_PROCESS
+
 #define ACE_LACKS_GETIPNODEBYADDR
 #define ACE_LACKS_GETIPNODEBYNAME
 
diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h
index 25444af91a3..738a2a730de 100644
--- a/ACE/ace/config-macosx.h
+++ b/ACE/ace/config-macosx.h
@@ -77,9 +77,6 @@
 
 #define ACE_HAS_SOCKADDR_IN6_SIN6_LEN
 
-// Platform supports System V IPC (most versions of UNIX, but not Win32)
-//#define ACE_HAS_SYSV_IPC
-
 // Compiler/platform contains the <sys/syscall.h> file.
 #define ACE_HAS_SYS_SYSCALL_H
 
diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h
index e4a2fd160c1..12c0afc0b8f 100644
--- a/ACE/ace/config-netbsd.h
+++ b/ACE/ace/config-netbsd.h
@@ -71,7 +71,7 @@
 #define ACE_HAS_STRINGS 1
 #define ACE_HAS_STRING_CLASS 1
 #define ACE_HAS_SVR4_DYNAMIC_LINKING 1
-#define ACE_HAS_SYSV_IPC 1
+#define ACE_HAS_SYSV_IPC
 #define ACE_HAS_SYS_FILIO_H 1
 #define ACE_HAS_STRSIGNAL
 #define ACE_HAS_SYS_SOCKIO_H 1
diff --git a/ACE/ace/config-qnx.h b/ACE/ace/config-qnx.h
index 612e9ff0181..403a13d35fb 100644
--- a/ACE/ace/config-qnx.h
+++ b/ACE/ace/config-qnx.h
@@ -139,6 +139,7 @@
 #define ACE_HAS_SYS_SOCKIO_H 1
 #define ACE_HAS_SYSCTL
 #define ACE_HAS_SIGACTION_CONSTP2 1
+#define ACE_LACKS_PTHREAD_SCOPE_PROCESS
 
 #if _NTO_VERSION < 650
 # define ACE_LACKS_NFDBITS
diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h
index 4162cb6c970..5532da02815 100644
--- a/ACE/ace/config-vxworks6.4.h
+++ b/ACE/ace/config-vxworks6.4.h
@@ -202,6 +202,8 @@
 #define ACE_LACKS_SYMLINKS
 #define ACE_LACKS_ISCTYPE
 
+#define ACE_LACKS_PTHREAD_SCOPE_PROCESS
+
 #if defined __RTP__
   // We are building for RTP mode
   #if !defined (ACE_AS_STATIC_LIBS)
diff --git a/ACE/bin/PerlACE/ProcessAndroid.pm b/ACE/bin/PerlACE/ProcessAndroid.pm
index 83689511213..1e7fbeb0d33 100644
--- a/ACE/bin/PerlACE/ProcessAndroid.pm
+++ b/ACE/bin/PerlACE/ProcessAndroid.pm
@@ -407,7 +407,7 @@ sub PutFile ($)
 
     my $adb_process = $ENV{'ANDROID_SDK_ROOT'} . "/platform-tools/adb";
 
-    my $cmd = "$adb_process" . ' push '. "$src $dest $silent";
+    my $cmd = "$adb_process" . ' push '. "\"$src\" \"$dest\" $silent";
 
     if (defined $ENV{'ACE_TEST_VERBOSE'}) {
       print STDERR "PutFile cmd: $cmd\n";
diff --git a/ACE/bin/PerlACE/TestTarget_Android.pm b/ACE/bin/PerlACE/TestTarget_Android.pm
index 46145fb39e6..9fed5ae507f 100644
--- a/ACE/bin/PerlACE/TestTarget_Android.pm
+++ b/ACE/bin/PerlACE/TestTarget_Android.pm
@@ -346,7 +346,7 @@ sub PutFile ($)
     my $adb_process = $ENV{'ANDROID_SDK_ROOT'} . "/platform-tools/adb";
 
     my $targetfile = $self->LocalFile ($src);
-    my $cmd = "$adb_process" . ' push '. "$src $targetfile $silent";
+    my $cmd = "$adb_process" . ' push '. "\"$src\" \"$targetfile\" $silent";
 
     if (defined $ENV{'ACE_TEST_VERBOSE'}) {
       print STDERR "PutFile cmd: $cmd\n";
diff --git a/ACE/tests/Bug_3912_Regression_Test.cpp b/ACE/tests/Bug_3912_Regression_Test.cpp
index 3a8e3ae1a3e..5283103ec82 100644
--- a/ACE/tests/Bug_3912_Regression_Test.cpp
+++ b/ACE/tests/Bug_3912_Regression_Test.cpp
@@ -61,18 +61,32 @@ run_test (int argc, ACE_TCHAR *argv[])
   Close_Handler* close_handler = 0;
   ACE_NEW_RETURN(close_handler, Close_Handler (&close_called), -1);
 
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Opening service config\n")));
+
   status = ACE_Service_Config::open (argc,
                                      argv,
                                      ACE_DEFAULT_LOGGER_KEY,
                                      true,
                                      true /*ignore def svc.conf*/);
   if (status != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("run_test, %p\n")
-                       ACE_TEXT ("ACE_Service_Config::open")),
-                       status);
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                        ACE_TEXT ("run_test, %p\n")
+                        ACE_TEXT ("ACE_Service_Config::open")),
+                        status);
+    }
+  else
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Service config opened\n")));
+
 
   ACE_Service_Repository *asr = ACE_Service_Repository::instance ();
+  if (asr == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("run_test, no service repository\n")),
+                       -1);
+
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Finding close test module\n")));
+
   const ACE_Service_Type* st = 0;
   status = asr->find (ACE_TEXT ("Close_Test_Module"), &st);
   if (status != 0)
@@ -87,6 +101,10 @@ run_test (int argc, ACE_TCHAR *argv[])
   MT_Module* close_test_module =
     static_cast <MT_Module *> (st->type()->object ());
 
+  if (close_test_module == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("run_test, no close test module\n")),
+                       -1);
   close_test_module->reader (close_handler);
 
   //
@@ -100,6 +118,8 @@ run_test (int argc, ACE_TCHAR *argv[])
   const ACE_Module_Type* module_type =
     static_cast< const ACE_Module_Type*>(st->type ());
 
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Finding close test stream\n")));
+
   status = asr->find (ACE_TEXT ("Close_Test_Stream"), &st);
   if (status != 0)
   {
@@ -111,6 +131,8 @@ run_test (int argc, ACE_TCHAR *argv[])
   const ACE_Stream_Type* close_test_stream =
     static_cast<const ACE_Stream_Type*> (st->type ());
 
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Removing module\n")));
+
   ACE_Stream_Type *nc_stream = const_cast<ACE_Stream_Type*>(close_test_stream);
   ACE_Module_Type *nc_module = const_cast<ACE_Module_Type*>(module_type);
   nc_stream->remove (nc_module);
@@ -118,7 +140,7 @@ run_test (int argc, ACE_TCHAR *argv[])
   if (!close_called)
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("close not called\n")));
-      status++;
+      ++status;
     }
   else
     {
@@ -132,13 +154,25 @@ run_main(int, ACE_TCHAR *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("Bug_3912_Regression_Test"));
 
+  ACE_TCHAR conf_file_name [MAXPATHLEN];
+#if defined (TEST_DIR)
+  ACE_OS::strcpy (conf_file_name, TEST_DIR);
+  ACE_OS::strcat (conf_file_name, ACE_DIRECTORY_SEPARATOR_STR);
+  ACE_OS::strcat (conf_file_name, ACE_TEXT ("Bug_3912_Regression_Test.conf"));
+#else
+  ACE_OS::strcpy (conf_file_name, ACE_TEXT ("Bug_3912_Regression_Test.conf"));
+#endif
+
   ACE_TCHAR * _argv[3] = {argv[0],
                           const_cast<ACE_TCHAR*> (ACE_TEXT ("-f")),
-                          const_cast<ACE_TCHAR*>
-                          (ACE_TEXT ("Bug_3912_Regression_Test.conf"))};
+                          const_cast<ACE_TCHAR*> (conf_file_name)};
+
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting test\n")));
 
   int status = run_test (3,_argv);
 
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Closing service config\n")));
+
   ACE_Service_Config::fini_svcs ();
 
   ACE_END_TEST;
diff --git a/ACE/tests/Compiler_Features_21_Test.cpp b/ACE/tests/Compiler_Features_21_Test.cpp
index 50c410f3cd0..cab3a50cd7b 100644
--- a/ACE/tests/Compiler_Features_21_Test.cpp
+++ b/ACE/tests/Compiler_Features_21_Test.cpp
@@ -24,7 +24,7 @@ struct B
 
 int xxx()
 {
-  B local_array();
+  B local_array;
   return 0;
 }
 
diff --git a/ACE/tests/MEM_Stream_Test.cpp b/ACE/tests/MEM_Stream_Test.cpp
index 14b1fa6bc4f..4118115ab23 100644
--- a/ACE/tests/MEM_Stream_Test.cpp
+++ b/ACE/tests/MEM_Stream_Test.cpp
@@ -175,7 +175,9 @@ run_client (u_short port,
 
   if (connector.connect (stream, to_server.get_remote_addr ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"), ACE_TEXT ("connector.connect()")),
+                       ACE_TEXT ("Failed to connect to <%C> %p\n"),
+                       to_server.get_host_name (),
+                       ACE_TEXT ("connector.connect()")),
                       -1);
 
   ACE_TCHAR buf[MAXPATHLEN];
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp
index a13560d6f8d..7848c568cf2 100644
--- a/ACE/tests/Malloc_Test.cpp
+++ b/ACE/tests/Malloc_Test.cpp
@@ -40,6 +40,7 @@ typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC;
 #define MUTEX_NAME ACE_TEXT ("test_lock")
 
 #if !defined (ACE_LINUX) && !defined (ACE_OPENVMS) \
+    && !defined (ACE_ANDROID) \
     && !(defined (ACE_WIN32) \
          && (defined (ghs) || defined (__MINGW32__) )) \
     && !(defined (__OpenBSD__) && defined (ACE_HAS_PTHREADS))
@@ -49,7 +50,7 @@ typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC;
 // Mingw's gcc does not support structural exceptions.
 // Win9x doesn't support remaps.
 // OpenBSD causes this test to hang in the child when pthreads are enabled.
-// On these plarforms, we make sure the remapping will never occur.
+// On these platforms, we make sure the remapping will never occur.
 #endif /* ACE_LINUX && Win32 GHS*/
 
 #if defined (ACE_WIN32)
diff --git a/ACE/tests/Process_Mutex_Test.cpp b/ACE/tests/Process_Mutex_Test.cpp
index 46273817eed..3c4a8dda058 100644
--- a/ACE/tests/Process_Mutex_Test.cpp
+++ b/ACE/tests/Process_Mutex_Test.cpp
@@ -142,7 +142,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   else
     {
       ACE_START_TEST (ACE_TEXT ("Process_Mutex_Test"));
-#     if !defined( ACE_HAS_SYSV_IPC) || defined( ACE_USES_MUTEX_FOR_PROCESS_MUTEX )
+#     if !defined( ACE_HAS_SYSV_IPC) || defined(ACE_USES_MUTEX_FOR_PROCESS_MUTEX)
       // When Process_Mutex is pthreads based, then the owner of mutex destroys it
       // in destructor. This may disturb the other processes which still uses the
       // mutex. It is safer then to hold the mutex in main process, and destroy it after
diff --git a/ACE/tests/Process_Test.cpp b/ACE/tests/Process_Test.cpp
index f91f65b7f0a..15a8783be7b 100644
--- a/ACE/tests/Process_Test.cpp
+++ b/ACE/tests/Process_Test.cpp
@@ -23,8 +23,6 @@
 #include "ace/SString.h"
 #include "ace/OS_NS_stdlib.h"
 
-
-
 // This will only work on Linux. Even UNIX-ish with /proc filesys lacks the
 // 'self' level and link to the opened file name.
 static const char *proc_self_fd = "/proc/self/fd/";
diff --git a/ACE/tests/Service_Config_Test.cpp b/ACE/tests/Service_Config_Test.cpp
index fb6ada61d00..0b04da08fdd 100644
--- a/ACE/tests/Service_Config_Test.cpp
+++ b/ACE/tests/Service_Config_Test.cpp
@@ -175,8 +175,11 @@ testFailedServiceInit (int, ACE_TCHAR *[])
 void
 testLoadingServiceConfFileAndProcessNo (int argc, ACE_TCHAR *argv[])
 {
+  u_int error0 = error;
   ACE_ARGV new_argv;
 
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Starting testLoadingServiceConfFileAndProcessNo\n")));
+
 #if defined (ACE_USES_WCHAR)
   // When using full Unicode support, use the version of the Service
   // Configurator file appropriate to the platform.
@@ -204,6 +207,23 @@ testLoadingServiceConfFileAndProcessNo (int argc, ACE_TCHAR *argv[])
     ACE_TEXT (ACE_DEFAULT_SVC_CONF_EXT);
 #endif  /* ACE_USES_WCHAR */
 
+  ACE_TCHAR pid_file_name [MAXPATHLEN];
+#if defined (TEST_DIR)
+  ACE_OS::strcpy (pid_file_name, TEST_DIR);
+  ACE_OS::strcat (pid_file_name, ACE_DIRECTORY_SEPARATOR_STR);
+  ACE_OS::strcat (pid_file_name, ACE_TEXT ("Service_Config_Test.pid"));
+#else
+  ACE_OS::strcpy (pid_file_name, ACE_TEXT ("Service_Config_Test.pid"));
+#endif
+  ACE_TCHAR svc_conf_file_name [MAXPATHLEN];
+#if defined (TEST_DIR)
+  ACE_OS::strcpy (svc_conf_file_name, TEST_DIR);
+  ACE_OS::strcat (svc_conf_file_name, ACE_DIRECTORY_SEPARATOR_STR);
+  ACE_OS::strcat (svc_conf_file_name, svc_conf);
+#else
+  ACE_OS::strcpy (svc_conf_file_name, svc_conf);
+#endif
+
   // Process the Service Configurator directives in this test's Making
   // sure we have more than one option with an argument, to capture
   // any errors caused by "reshuffling" of the options.
@@ -212,9 +232,9 @@ testLoadingServiceConfFileAndProcessNo (int argc, ACE_TCHAR *argv[])
               || new_argv.add (ACE_TEXT ("-k")) == -1
               || new_argv.add (ACE_TEXT ("xxx")) == -1
               || new_argv.add (ACE_TEXT ("-p")) == -1
-              || new_argv.add (ACE_TEXT ("Service_Config_Test.pid")) == -1
+              || new_argv.add (pid_file_name) == -1
               || new_argv.add (ACE_TEXT ("-f")) == -1
-              || new_argv.add (svc_conf) == -1)
+              || new_argv.add (svc_conf_file_name) == -1)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("line %l %p\n"),
@@ -226,6 +246,8 @@ testLoadingServiceConfFileAndProcessNo (int argc, ACE_TCHAR *argv[])
   // <ACE_Service_Config> gets called.
   ACE_Service_Config daemon;
 
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Starting daemon using %s\n"), new_argv.buf ()));
+
   if (daemon.open (new_argv.argc (), new_argv.argv ()) == -1 &&
       errno != ENOENT)
     {
@@ -247,6 +269,11 @@ testLoadingServiceConfFileAndProcessNo (int argc, ACE_TCHAR *argv[])
 
   // Wait for all threads to complete.
   ACE_Thread_Manager::instance ()->wait ();
+
+  if (error == error0)
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT("testLoadingServiceConfFileAndProcessNo completed successfully\n")));
+  else
+    ACE_ERROR ((LM_ERROR, ACE_TEXT("testLoadingServiceConfFileAndProcessNo test failed\n")));
 }
 
 
@@ -456,7 +483,6 @@ testLimits (int , ACE_TCHAR *[])
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Limits test completed successfully\n")));
   else
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Limits test failed\n")));
-
 }
 
 void
diff --git a/ACE/tests/test_config.h b/ACE/tests/test_config.h
index c5fb375402b..502a9bb33fb 100644
--- a/ACE/tests/test_config.h
+++ b/ACE/tests/test_config.h
@@ -86,7 +86,7 @@ size_t const ACE_MAX_THREADS = 4;
 #endif /* ACE_START_TEST */
 
 #ifndef ACE_END_TEST
-# define ACE_END_TEST ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test t %D\n"), program));
+# define ACE_END_TEST ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test %D\n"), program));
 #endif /* ACE_END_TEST */
 #endif /* ACE_HAS_CONSOLE_TEST_OUTPUT */