ChangeLogTag:Wed Mar 1 23:47:13 UTC 2006 Steve Huston <shuston@riverace.com>

33 files changed, 231 insertions, 174 deletions

diff --git a/ChangeLog b/ChangeLog
index 2db808d2d01..ca896ad10d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,71 @@
+Wed Mar  1 23:47:13 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * bin/make_release: Added "wince=1" to the MPC -features option for
+          the WinCE file generation; helps prevents WinCE-hostile projects
+          from being generated.
+
+        * ace/config-win32-msvc-8.h: VC8 still lacks sigatomic_t for WinCE 5.
+
+        * ace/config-WinCE.h: Removed some compiler-specific settings that
+          were moved to compiler-specific configs previously but not updated
+          for CE. Updated things that are now available.
+
+        * tests/CDR_File_Test.cpp:
+        * tests/CE_fostream.{h cpp}: CE iostream hack not needed for CE when
+          iostreams are available (VC 8, included).
+
+        * examples/Reactor/TP_Reactor/client.cpp:
+        * examples/Reactor/TP_Reactor/server.cpp:
+        * examples/Reactor/TP_Reactor/AcceptHandler.cpp:
+        * examples/Reactor/TP_Reactor/ReadHandler.cpp:
+        * netsvcs/servers/main.cpp:
+        * tests/Array_Map_Test.cpp: Use ACE_TEXT around all pieces of
+          concatenated string; VC8 WinCE misses the line ending.
+          Removed ACE_TEXT around ACE_TRACE's argument; ACE_TRACE adds it.
+
+        * netsvcs/lib/Token_Handler.{h cpp} (init, parse_args): Changed argv
+          from char*[] to ACE_TCHAR*[]. Also fixed some missing ACE_TEXTs.
+
+        * protocols/ace/RMCast/Acknowledge.cpp:
+        * protocols/ace/RMCast/Link.cpp:
+        * protocols/ace/RMCast/Protocol.h:
+        * protocols/ace/RMCast/Retransmit.cpp:
+        * protocols/ace/RMCast/Socket.cpp:
+        * protocols/ace/TMCast/LinkListener.hpp:
+        * protocols/ace/TMCast/TransactionController.hpp:
+        * protocols/ace/TMCast/Group.cpp: ACEified naked system calls abort()
+          and perror().
+
+        * examples/APG/ThreadSafety/Tokens_Deadlock.cpp:
+        * examples/APG/Processes/Spawn.cpp:
+        * examples/APG/Processes/Process_Mutex.cpp: Add missing ACE_TEXT around
+          string args.
+
+        * examples/NT_Service/NT_Service.mpc: Add avoids += wince - CE doesn't
+          do services.
+
+        * examples/Web_Crawler/main.cpp: Don't try SIGFPE protection if
+          on WinCE.
+
+        * examples/Web_Crawler/URL_Status.h: Changed STATUS_NOT_FOUND to
+          STATUS_ITEM_NOT_FOUND and STATUS_NOT_IMPLEMENTED to
+          STATUS_OP_NOT_IMPLEMENTED. CE apparantly has macros with these
+          names that messes this up.
+
+        * examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc: Added wince to the
+          "avoids" clause for APC, Registry_Changes, Talker and
+          Window_Messages; WinCE doesn't the necessary features.
+
+        * examples/Reactor/WFMO_Reactor/Window_Messages.cpp: Add missing
+          #include "ace/Auto_Event.h"
+
+        * tests/MT_SOCK_Test.cpp: Remove the #if ACE_WIN64 from the check
+          for first send causes reset. This happens with 32-bit as well,
+          at least on Win XP-64 SP2. It's unrelated to the functionality under
+          test, and if there's an actual sending side botch that causes the
+          socket to be closed prematurely, it should show up as another error
+          in the server side.
+
 Wed Mar  1 16:12:50 UTC 2006  Steve Huston  <shuston@riverace.com>
 
         * tests/run_test.lst: Added !BAD_AIO to the Proactor_Test and
diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h
index d3ac95baa85..2b06b24ee43 100644
--- a/ace/config-WinCE.h
+++ b/ace/config-WinCE.h
@@ -69,24 +69,13 @@
 
 #define ACE_USES_WINCE_SEMA_SIMULATION
 
-#if (_MSC_VER < 1400)
-#  define ACE_LACKS_IOSTREAM_TOTALLY
-#endif
-#define ACE_LACKS_ACE_IOSTREAM
-#define ACE_LACKS_AUTO_PTR
-
-#if defined (ACE_HAS_STRICT)
-# undef ACE_HAS_STRICT
-#endif  // ACE_HAS_STRICT
-#define ACE_HAS_STRICT 1
-
 #define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1
 
 // FILE stuff isn't always defined in CE
-#ifndef _FILE_DEFINED
+#if (_MSC_VER < 1400) && !defined (_FILE_DEFINED)
   typedef void FILE;
 # define _FILE_DEFINED
-#endif  // _FILE_DEFINED
+#endif  /* _MSC_VER < 1400 && !_FILE_DEFINED */
 
 // This was defined in previous versions of CE, but not 2.11
 #define EXCEPTION_ACCESS_VIOLATION STATUS_ACCESS_VIOLATION
@@ -196,36 +185,19 @@
 # define ACE_LACKS_QSORT
 #endif  // _WIN32_WCE_EMULATION
 
-// @@ Followings are used to keep existing programs happy.
-
-#define ostream FILE
-# if !defined (BUFSIZ)
+#if !defined (BUFSIZ)
 #  define BUFSIZ 1024
-#endif  // BUFSIZ
+#endif
 
 typedef void (__cdecl * __sighandler_t)(int); // keep Signal compilation happy
 typedef long off_t;
 
 #define ACE_LACKS_MALLOC_H      // We do have malloc.h, but don't use it.
 
-//#if (UNDER_CE < 300)  // from prior ACE porting effort; left for future reference
-//#define ACE_LACKS_STRPBRK
-//#define ACE_LACKS_STRSPN
-//#define ACE_LACKS_STRTOD
-//#define ACE_LACKS_STRTOL
-//#define ACE_LACKS_STRTOUL
-//#endif // UNDER_CE < 300
-
 #define ACE_HAS_WINCE_BROKEN_ERRNO
 
 #define ACE_HAS_STRDUP_EMULATION
 
-// CE doesn't have <sys/types.h> instead <types.h>
-#define ACE_HAS_FLAT_TYPES_H
-
-// @@ This needs to be defined and initialized as a static. (Singleton?)
-#define ACE_DEFAULT_LOG_STREAM 0
-
 // WinCE can't do fixed addresses for memory-mapped files.
 #if defined (ACE_DEFAULT_BASE_ADDR)
 #  undef ACE_DEFAULT_BASE_ADDR
@@ -234,9 +206,8 @@ typedef long off_t;
 
 #define ACE_HAS_TSS_EMULATION
 
-// Not sure if this is true for all versions.  dhinton
+// This is still true up thru VC8...
 #define ACE_LACKS_ERRNO_H
-#define ACE_LACKS_TIME_H
 #define ACE_LACKS_SIGNAL_H
 #define ACE_LACKS_SYS_STAT_H
 
diff --git a/ace/config-win32-msvc-8.h b/ace/config-win32-msvc-8.h
index 3f91e382887..6f91aa0416d 100644
--- a/ace/config-win32-msvc-8.h
+++ b/ace/config-win32-msvc-8.h
@@ -51,7 +51,6 @@
 #  if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x501)
 #    define ACE_HAS_SIG_ATOMIC_T
 #  endif /* !Win CE 5.0 or less */
-//#endif /* _WIN32_WCE && _WIN32_WCE < 500 */
 
 #define ACE_HAS_STRERROR
 #define ACE_HAS_STRPTIME
diff --git a/bin/make_release b/bin/make_release
index 6ad7cd0e0a9..c8f425a644b 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -807,7 +807,7 @@ sub generate_makefiles () {
     # and we're generating only CE builds, replace it instead of adding to it.
     my $tmp_ce = '-value_template platforms=\'"Pocket PC 2003 (ARMV4)"\' ';
     $tmp_ce = $tmp_ce.'-value_template platforms+=\'"Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"\'';
-    my $ce_option = '-name_modifier *_WinCE -features uses_wchar=1 '.$tmp_ce;
+    my $ce_option = '-name_modifier *_WinCE -features \'"uses_wchar=1,wince=1"\' '.$tmp_ce;
 
     &ex ("cd ACE_wrappers; \
           bin/mwc.pl $exclude_option $mpc_option; \
diff --git a/examples/APG/Processes/Process_Mutex.cpp b/examples/APG/Processes/Process_Mutex.cpp
index a10078ad2ac..2afb89803b9 100644
--- a/examples/APG/Processes/Process_Mutex.cpp
+++ b/examples/APG/Processes/Process_Mutex.cpp
@@ -55,7 +55,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   else              // Run as the parent.
     {
       ACE_Process_Options options;
-      options.command_line ("%s a", argv[0]);
+      options.command_line (ACE_TEXT ("%s a"), argv[0]);
       ACE_Process processa, processb;
 
       pid_t pida = processa.spawn (options);
diff --git a/examples/APG/Processes/Spawn.cpp b/examples/APG/Processes/Spawn.cpp
index 6d727ea77db..0776a44a8ec 100644
--- a/examples/APG/Processes/Spawn.cpp
+++ b/examples/APG/Processes/Spawn.cpp
@@ -75,7 +75,7 @@ private:
   {
     ACE_TRACE ("Manager::prepare");
 
-    options.command_line ("%s 1", this->programName_);
+    options.command_line (ACE_TEXT ("%s 1"), this->programName_);
     if (this->setStdHandles (options) == -1 ||
         this->setEnvVariable (options) == -1)
       return -1;
diff --git a/examples/APG/ThreadSafety/Tokens_Deadlock.cpp b/examples/APG/ThreadSafety/Tokens_Deadlock.cpp
index 8e1e254684a..f6c6d22491f 100644
--- a/examples/APG/ThreadSafety/Tokens_Deadlock.cpp
+++ b/examples/APG/ThreadSafety/Tokens_Deadlock.cpp
@@ -12,12 +12,12 @@ class ThreadOne : public ACE_Task_Base
 public:
   virtual int svc (void)
   {
-    ACE_Local_Mutex mutex1 ("resource1",
+    ACE_Local_Mutex mutex1 (ACE_TEXT ("resource1"),
                             0, // Deadlock detection enabled.
                             1);// Debugging enabled.
     mutex1.acquire ();
     ACE_OS::sleep (2);
-    ACE_Local_Mutex mutex2 ("resource2", 0, 1);
+    ACE_Local_Mutex mutex2 (ACE_TEXT ("resource2"), 0, 1);
     mutex2.acquire ();
     return 0;
   }
@@ -28,12 +28,12 @@ class ThreadTwo : public ACE_Task_Base
 public:
   virtual int svc (void)
   {
-    ACE_Local_Mutex mutex2 ("resource2",
+    ACE_Local_Mutex mutex2 (ACE_TEXT ("resource2"),
                             0, // Deadlock detection enabled.
                             1);// Debugging enabled.
     mutex2.acquire ();
     ACE_OS::sleep (2);
-    ACE_Local_Mutex mutex1 ("resource1",
+    ACE_Local_Mutex mutex1 (ACE_TEXT ("resource1"),
                             0, // Deadlock detection enabled.
                             1);// Debugging enabled.
     mutex1.acquire ();
diff --git a/examples/NT_Service/NT_Service.mpc b/examples/NT_Service/NT_Service.mpc
index 2adfe6f6feb..4fdbe054dfe 100644
--- a/examples/NT_Service/NT_Service.mpc
+++ b/examples/NT_Service/NT_Service.mpc
@@ -2,5 +2,6 @@
 // $Id$
 
 project : aceexe, winregistry {
+  avoids += wince
   exename = main
 }
diff --git a/examples/Reactor/TP_Reactor/AcceptHandler.cpp b/examples/Reactor/TP_Reactor/AcceptHandler.cpp
index 1e1d2c3aab0..7ae34d2b2b4 100644
--- a/examples/Reactor/TP_Reactor/AcceptHandler.cpp
+++ b/examples/Reactor/TP_Reactor/AcceptHandler.cpp
@@ -17,34 +17,34 @@ AcceptHandler:: AcceptHandler(ACE_Reactor *reactor) :
         ACE_Event_Handler(),
         mReactor(reactor == 0 ? ACE_Reactor::instance() : reactor),
         mAcceptor() {
-    ACE_TRACE(ACE_TEXT("AcceptHandler:: AcceptHandler(ACE_Reactor *)"));
+    ACE_TRACE("AcceptHandler:: AcceptHandler(ACE_Reactor *)");
 }
 
 AcceptHandler::~AcceptHandler() {
-    ACE_TRACE(ACE_TEXT("AcceptHandler::~AcceptHandler()"));
+    ACE_TRACE("AcceptHandler::~AcceptHandler()");
 }
 
 int AcceptHandler::open(void) {
-    ACE_TRACE(ACE_TEXT("AcceptHandler::open(void)"));
+    ACE_TRACE("AcceptHandler::open(void)");
 
     // create the local address used for the service (PORT is from common.h)
     ACE_INET_Addr addr(PORT);
 
     // open a port using the acceptor; reuse the address later
     if (mAcceptor.open(addr, 1) == -1)
-        ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to open " \
-                        "listening socket. (errno = %i: %m)\n"), errno), -1);
+      ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to open ")
+                        ACE_TEXT ("listening socket. (errno = %i: %m)\n"), errno), -1);
 
     // register the handler with the reactor
     if (mReactor->register_handler(this,
             ACE_Event_Handler::ACCEPT_MASK) == -1) {
-        ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to register accept " \
-                "handler. (errno = %i: %m)\n"), errno));
+      ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to register accept ")
+                 ACE_TEXT ("handler. (errno = %i: %m)\n"), errno));
 
         // don't leave the acceptor open
         if (mAcceptor.close() == -1)
-            ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to close the socket " \
-                            "after previous error. (errno = %i: %m)\n"),
+          ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to close the socket ")
+                     ACE_TEXT ("after previous error. (errno = %i: %m)\n"),
                         errno));
         return -1;
     }
@@ -53,12 +53,12 @@ int AcceptHandler::open(void) {
 }
 
 ACE_HANDLE AcceptHandler::get_handle(void) const {
-    ACE_TRACE(ACE_TEXT("AcceptHandler::get_handle(void)"));
+    ACE_TRACE("AcceptHandler::get_handle(void)");
     return mAcceptor.get_handle();
 }
 
 int AcceptHandler::handle_input(ACE_HANDLE) {
-    ACE_TRACE(ACE_TEXT("AcceptHandler::handle_input(ACE_HANDLE)"));
+    ACE_TRACE("AcceptHandler::handle_input(ACE_HANDLE)");
 
     ACE_INET_Addr clientAddr;
 
@@ -66,22 +66,22 @@ int AcceptHandler::handle_input(ACE_HANDLE) {
     ReadHandler *reader = 0;
     ACE_NEW_NORETURN (reader, ReadHandler());
     if (reader == 0)
-        ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to allocate " \
-                    "reader. (errno = %i: %m)\n"), errno), -1);
+      ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to allocate ")
+                        ACE_TEXT ("reader. (errno = %i: %m)\n"), errno), -1);
 
     // put reader in an auto pointer so we can use ACE_ERROR_RETURN safely
     auto_ptr<ReadHandler> pReader(reader);
 
     // accept the connection using the reader's stream
     if (mAcceptor.accept(reader->getStream(), &clientAddr) == -1)
-        ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to accept " \
-                    "client connection. (errno = %i: %m)\n"), errno), -1);
+      ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to accept ")
+                    ACE_TEXT ("client connection. (errno = %i: %m)\n"), errno), -1);
 
     // register the reader with the reactor
     if (mReactor->register_handler(reader,
             ACE_Event_Handler::READ_MASK) == -1)
-        ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to register " \
-                    "read handler. (errno = %i: %m)\n"), errno), -1);
+      ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to register ")
+                        ACE_TEXT ("read handler. (errno = %i: %m)\n"), errno), -1);
 
     // from now on the read handler takes care of itself
     pReader.release();
@@ -90,13 +90,12 @@ int AcceptHandler::handle_input(ACE_HANDLE) {
 }
 
 int AcceptHandler::handle_close(ACE_HANDLE, ACE_Reactor_Mask) {
-    ACE_TRACE(ACE_TEXT("AcceptHandler::handle_close(ACE_HANDLE, " \
-                "ACE_Reactor_Mask)"));
+    ACE_TRACE("AcceptHandler::handle_close(ACE_HANDLE, ACE_Reactor_Mask)");
 
     // close the listening socket
     if (mAcceptor.close() == -1)
-        ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to close the "
-                    "socket. (errno = %i: %m)\n"), errno));
+      ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to close the ")
+                 ACE_TEXT ("socket. (errno = %i: %m)\n"), errno));
 
     // no need to distinguish between error during close and normal close
     // since ACE does not evaluate the return value of handle_close()
diff --git a/examples/Reactor/TP_Reactor/ReadHandler.cpp b/examples/Reactor/TP_Reactor/ReadHandler.cpp
index 91caaf0ec6e..06c6c953046 100644
--- a/examples/Reactor/TP_Reactor/ReadHandler.cpp
+++ b/examples/Reactor/TP_Reactor/ReadHandler.cpp
@@ -38,8 +38,8 @@ ReadHandler::~ReadHandler() {
     ACE_TRACE(ACE_TEXT("ReadHandler::~ReadHandler()"));
 
     if (mStream.close() == -1)
-        ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to close socket. "
-                    "(errno = %i: %m)\n"), errno));
+      ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to close socket. ")
+                 ACE_TEXT ("(errno = %i: %m)\n"), errno));
 
     delete[] mData;
 }
@@ -76,8 +76,8 @@ int ReadHandler::handle_input(ACE_HANDLE) {
         //       platforms (i.e. little-endian/big-endian, data type size)
         if (mStream.recv_n(&mDataSize, sizeof(mDataSize),
                 &connTimeout) != sizeof(mDataSize)) {
-            ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to receive " \
-                        "request. (errno = %i: %m)\n"), errno));
+          ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to receive ")
+                     ACE_TEXT ("request. (errno = %i: %m)\n"), errno));
             INVOCATION_RETURN(-1);
         }
 
@@ -90,8 +90,8 @@ int ReadHandler::handle_input(ACE_HANDLE) {
         if (mDataSize > 0) {
             mData = new (std::nothrow) char[mDataSize];
             if (mData == 0)
-                ACE_DEBUG((LM_DEBUG, ACE_TEXT("%N:%l: Failed to allocate " \
-                            "data buffer.\n")));
+              ACE_DEBUG((LM_DEBUG, ACE_TEXT("%N:%l: Failed to allocate ")
+                         ACE_TEXT ("data buffer.\n")));
             else
                 response = 'K';
         }
@@ -99,8 +99,8 @@ int ReadHandler::handle_input(ACE_HANDLE) {
         // send the response to the client (which is still 0, if the
         // allocation did not succeed)
         if (mStream.send_n(&response, sizeof(response), &connTimeout) != 1) {
-            ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to send "
-                            "response. (errno = %i: %m)\n"), errno));
+          ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to send ")
+                     ACE_TEXT ("response. (errno = %i: %m)\n"), errno));
             INVOCATION_RETURN(-1);
         }
 
@@ -121,16 +121,16 @@ int ReadHandler::handle_input(ACE_HANDLE) {
 
         // receive the data from the client
         if (mStream.recv_n(mData, mDataSize, &connTimeout) != mDataSize) {
-            ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to receive data." \
-                            "(errno = %i: %m)\n"), errno));
+          ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to receive data.")
+                     ACE_TEXT ("(errno = %i: %m)\n"), errno));
             INVOCATION_RETURN(-1);
         }
 
         response = 'K';
 
         if (mStream.send_n(&response, 1, &connTimeout) != 1) {
-            ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to send "
-                            "confirmation. (errno = %i: %m)\n"), errno));
+          ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to send ")
+                     ACE_TEXT ("confirmation. (errno = %i: %m)\n"), errno));
             INVOCATION_RETURN(-1);
         }
 
@@ -143,8 +143,7 @@ int ReadHandler::handle_input(ACE_HANDLE) {
 }
 
 int ReadHandler::handle_close(ACE_HANDLE, ACE_Reactor_Mask) {
-    ACE_TRACE(ACE_TEXT("ReadHandler::handle_close(ACE_HANDLE, " \
-                "ACE_Reactor_Mask)"));
+  ACE_TRACE("ReadHandler::handle_close(ACE_HANDLE, ACE_Reactor_Mask)");
 
     delete this;
     return 0;
diff --git a/examples/Reactor/TP_Reactor/client.cpp b/examples/Reactor/TP_Reactor/client.cpp
index eebfab3c1c9..509f2e9c457 100644
--- a/examples/Reactor/TP_Reactor/client.cpp
+++ b/examples/Reactor/TP_Reactor/client.cpp
@@ -48,8 +48,9 @@ int ACE_TMAIN(int argc, ACE_TCHAR **argv) {
     char *someData = new (std::nothrow) char[size];
 
     if (someData == 0)
-        ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to allocate "
-                    "data buffer.\n")), -1);
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("%N:%l: Failed to allocate ")
+                         ACE_TEXT ("data buffer.\n")), -1);
 
     // put someData in an auto_ptr so it gets deleted automatically
     auto_ptr<char> pSomeData(someData);
@@ -74,8 +75,9 @@ int ACE_TMAIN(int argc, ACE_TCHAR **argv) {
 
         // connect to the server and get the stream
         if (connector.connect(stream, serverAddr) == -1) {
-            ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to connect to " \
-                            "server. (errno = %i: %m)\n"), errno));
+          ACE_ERROR((LM_ERROR,
+                     ACE_TEXT("%N:%l: Failed to connect to ")
+                     ACE_TEXT ("server. (errno = %i: %m)\n"), errno));
             break;
         }
 
@@ -85,15 +87,15 @@ int ACE_TMAIN(int argc, ACE_TCHAR **argv) {
             // Note: only use the sizeof and pointer to int on compatible
             //       platforms (i.e. little-endian/big-endian, data type size)
             if (stream.send_n(&size, sizeof(size), &connTimeout) != sizeof(size)) {
-                ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to  send " \
-                            "request. (errno = %i: %m)\n"), errno));
+                ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to  send ")
+                           ACE_TEXT ("request. (errno = %i: %m)\n"), errno));
                 throw(1);
             }
 
             // receive the answer
             if (stream.recv_n(&answer, sizeof(answer), &connTimeout) != 1) {
-                ACE_ERROR((LM_ERROR, ACE_TEXT("%N: %l: Failed to receive " \
-                                "1st response. (errno = %i: %m)\n"), errno));
+              ACE_ERROR((LM_ERROR, ACE_TEXT("%N: %l: Failed to receive ")
+                         ACE_TEXT ("1st response. (errno = %i: %m)\n"), errno));
                 throw(1);
             }
 
@@ -102,15 +104,15 @@ int ACE_TMAIN(int argc, ACE_TCHAR **argv) {
 
                 // send a huge message to the server
                 if (stream.send_n(someData, size, &connTimeout) != size) {
-                    ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to send " \
-                                "someData. (errno = %i: %m)\n"), errno));
+                  ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to send ")
+                             ACE_TEXT ("someData. (errno = %i: %m)\n"), errno));
                     throw(1);
                 }
 
                 // get an answer
                 if (stream.recv_n(&answer, sizeof(answer), &connTimeout) != 1) {
-                    ACE_ERROR((LM_ERROR, ACE_TEXT("%N: %l: Failed to receive " \
-                                "2nd response. (errno = %i: %m)\n"), errno));
+                  ACE_ERROR((LM_ERROR, ACE_TEXT("%N: %l: Failed to receive ")
+                             ACE_TEXT ("2nd response. (errno = %i: %m)\n"), errno));
                     throw(1);
                 }
 
@@ -127,8 +129,8 @@ int ACE_TMAIN(int argc, ACE_TCHAR **argv) {
 
         // close the current stream
         if (stream.close() == -1) {
-            ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to close " \
-                        "socket. (errno = %i: %m)\n"), errno));
+          ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to close ")
+                     ACE_TEXT ("socket. (errno = %i: %m)\n"), errno));
             break;
         }
     } // while
diff --git a/examples/Reactor/TP_Reactor/server.cpp b/examples/Reactor/TP_Reactor/server.cpp
index a028c67fcf4..0c147818424 100644
--- a/examples/Reactor/TP_Reactor/server.cpp
+++ b/examples/Reactor/TP_Reactor/server.cpp
@@ -22,7 +22,7 @@
  * @param arg is expected to be of type (ACE_Reactor *)
  */
 ACE_THR_FUNC_RETURN threadFunc(void *arg) {
-    ACE_TRACE(ACE_TEXT("threadFunc(void *)"));
+    ACE_TRACE("threadFunc(void *)");
 
     ACE_Reactor *reactor = (ACE_Reactor *) arg;
     reactor->run_reactor_event_loop();
@@ -44,14 +44,14 @@ int ACE_TMAIN(int, ACE_TCHAR **) {
     AcceptHandler *acceptHandler = 0;
     ACE_NEW_NORETURN (acceptHandler, AcceptHandler(&reactor));
     if (acceptHandler == 0)
-        ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to allocate " \
-                        "accept handler. (errno = %i: %m)\n"), errno), -1);
+      ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to allocate ")
+                        ACE_TEXT ("accept handler. (errno = %i: %m)\n"), errno), -1);
 
     // open the accept handler
     if (acceptHandler->open() == -1) {
         delete acceptHandler;
-        ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to open accept " \
-                        "handler. Exiting.\n")), -1);
+        ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%N:%l: Failed to open accept ")
+                          ACE_TEXT ("handler. Exiting.\n")), -1);
     }
 
     // spawn some threads which run the reactor event loop(s)
diff --git a/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc b/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc
index 3663aa7c6e1..eec632ee696 100644
--- a/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc
+++ b/examples/Reactor/WFMO_Reactor/WFMO_Reactor.mpc
@@ -9,6 +9,7 @@ project(*Abandoned): aceexe, wfmo {
 }
 
 project(*APC): aceexe, wfmo {
+  avoids += wince
   exename = apc
   Source_Files {
     APC.cpp
@@ -72,7 +73,7 @@ project(*Registration): aceexe, wfmo {
 }
 
 project(*Registry_Changes): aceexe, wfmo {
-  avoids += ace_for_tao
+  avoids += ace_for_tao wince
   exename = registry_changes
   Source_Files {
     Registry_Changes.cpp
@@ -94,7 +95,7 @@ project(*Suspended_Removals): aceexe, wfmo {
 }
 
 project(*Talker): aceexe, wfmo {
-  avoids += ace_for_tao
+  avoids += ace_for_tao wince
   exename = talker
   Source_Files {
     Talker.cpp
@@ -109,7 +110,7 @@ project(*Timeouts): aceexe, wfmo {
 }
 
 project(*Window_Messages): aceexe, wfmo {
-  avoids += ace_for_tao
+  avoids += ace_for_tao wince
   exename = window_messages
   Source_Files {
     Window_Messages.cpp
diff --git a/examples/Reactor/WFMO_Reactor/Window_Messages.cpp b/examples/Reactor/WFMO_Reactor/Window_Messages.cpp
index 9ae5d7fdf78..f5a1994168c 100644
--- a/examples/Reactor/WFMO_Reactor/Window_Messages.cpp
+++ b/examples/Reactor/WFMO_Reactor/Window_Messages.cpp
@@ -26,6 +26,7 @@
 #include "ace/Msg_WFMO_Reactor.h"
 #include "ace/Reactor.h"
 #include "ace/Auto_Ptr.h"
+#include "ace/Auto_Event.h"
 
 ACE_RCSID(WFMO_Reactor, Window_Messages, "$Id$")
 
diff --git a/examples/Web_Crawler/URL_Status.h b/examples/Web_Crawler/URL_Status.h
index c6b56042b24..672c5e4f240 100644
--- a/examples/Web_Crawler/URL_Status.h
+++ b/examples/Web_Crawler/URL_Status.h
@@ -39,9 +39,9 @@ public:
     STATUS_BAD_REQUEST = 400,
     STATUS_UNAUTHORIZED = 401,
     STATUS_FORBIDDEN = 403,
-    STATUS_NOT_FOUND = 404,
+    STATUS_ITEM_NOT_FOUND = 404,
     STATUS_INTERNAL_SERVER_ERROR = 500,
-    STATUS_NOT_IMPLEMENTED = 501,
+    STATUS_OP_NOT_IMPLEMENTED = 501,
     STATUS_BAD_GATEWAY = 502,
     STATUS_SERVICE_UNAVAILABLE = 503,
     STATUS_INSUFFICIENT_DATA = 399
diff --git a/examples/Web_Crawler/main.cpp b/examples/Web_Crawler/main.cpp
index ba5d37d71a8..1735f811b78 100644
--- a/examples/Web_Crawler/main.cpp
+++ b/examples/Web_Crawler/main.cpp
@@ -27,15 +27,16 @@ ACE_RCSID(Web_Crawler, main, "$Id$")
 void sig_handler (int)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "aborting!\n"));
+              ACE_TEXT ("aborting!\n")));
   ACE_OS::abort ();
 }
 
 int 
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+#if !defined (ACE_HAS_WINCE)
   ACE_Sig_Action sa ((ACE_SignalHandler) sig_handler, SIGFPE);
-
+#endif
   Web_Crawler crawler;
   
   if (crawler.open (argc, argv) == -1)
diff --git a/netsvcs/lib/Token_Handler.cpp b/netsvcs/lib/Token_Handler.cpp
index 4ed1243cfd9..ede624eaf8b 100644
--- a/netsvcs/lib/Token_Handler.cpp
+++ b/netsvcs/lib/Token_Handler.cpp
@@ -34,7 +34,7 @@ template class ACE_Strategy_Acceptor<ACE_Token_Handler, ACE_SOCK_ACCEPTOR>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 int
-ACE_Token_Acceptor::parse_args (int argc, char *argv[])
+ACE_Token_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRACE ("ACE_Token_Acceptor::parse_args");
 
@@ -53,8 +53,8 @@ ACE_Token_Acceptor::parse_args (int argc, char *argv[])
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                            "%n:\n[-p server-port]\n%a", 1),
-                           -1);
+                             ACE_TEXT ("%n:\n[-p server-port]\n"), 1),
+                            -1);
         }
     }
 
@@ -63,7 +63,7 @@ ACE_Token_Acceptor::parse_args (int argc, char *argv[])
 }
 
 int
-ACE_Token_Acceptor::init (int argc, char *argv[])
+ACE_Token_Acceptor::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRACE ("ACE_Token_Acceptor::init");
 
@@ -90,12 +90,13 @@ ACE_Token_Acceptor::init (int argc, char *argv[])
   ACE_INET_Addr server_addr;
 
   if (this->acceptor ().get_local_addr (server_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "get_remote_addr"), -1);
+    ACE_ERROR_RETURN
+      ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("get_remote_addr")), -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              "starting up Token Server at port %d on handle %d\n",
-             server_addr.get_port_number (),
-             this->acceptor ().get_handle ()));
+              ACE_TEXT ("starting up Token Server at port %d on handle %d\n"),
+              server_addr.get_port_number (),
+              this->acceptor ().get_handle ()));
   return 0;
 }
 
@@ -133,8 +134,8 @@ ACE_Token_Handler::send_reply (ACE_UINT32 err)
 
   if (n != (ssize_t) len)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p, expected len = %d, actual len = %d\n",
-                      "send failed", len, n), -1);
+                       ACE_TEXT ("%p, expected len = %d, actual len = %d\n"),
+                       ACE_TEXT ("send failed"), len, n), -1);
   else
     return 0;
 }
@@ -170,7 +171,8 @@ ACE_Token_Handler::acquire (ACE_Token_Proxy *proxy)
             (this, (void *) proxy, request_options_.timeout ());
           if (timeout_id_ == -1)
             {
-              ACE_ERROR ((LM_ERROR, "%p\n", "schedule_timer"));
+              ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
+                          ACE_TEXT ("schedule_timer")));
               return this->send_reply (errno);
             }
         }
@@ -256,7 +258,8 @@ ACE_Token_Handler::renew (ACE_Token_Proxy *proxy)
             (this, 0, request_options_.timeout ());
           if (timeout_id_ == -1)
             {
-              ACE_ERROR ((LM_ERROR, "%p\n", "schedule_timer"));
+              ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
+                          ACE_TEXT ("schedule_timer")));
               return this->send_reply (ACE_LOG_MSG->errnum ());
             }
         }
@@ -277,7 +280,9 @@ ACE_Token_Handler::remove (ACE_Token_Proxy * /* proxy */)
   ACE_DEBUG ((LM_DEBUG, "in remove for client id = %s\n",
              proxy->client_id ()));
 #endif /* 0 */
-  ACE_ERROR ((LM_ERROR, "sorry: ACE_Token_Handler::remove() is not implemented"));
+  ACE_ERROR
+    ((LM_ERROR,
+      ACE_TEXT ("sorry: ACE_Token_Handler::remove() is not implemented")));
 
   return this->send_reply (ENOTSUP);
 }
@@ -330,14 +335,14 @@ ACE_Token_Handler::get_proxy (void)
 
       // Put the new_proxy in this client_id's collection.
       if (collection_.insert (*proxy) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "insert failed\n"), 0);
+        ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("insert failed\n")), 0);
 
       // Delete our copy (one was created in the collection).
       delete proxy;
       proxy = collection_.is_member (token_request_.token_name ());
 
       if (proxy == 0)
-        ACE_ERROR_RETURN ((LM_ERROR, "is_member failed\n"), 0);
+        ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("is_member failed\n")), 0);
 
       // Set the client_id (it was set to 1 since we're
       // single-threaded.
@@ -407,7 +412,7 @@ ACE_Token_Handler::dispatch (void)
     case ACE_Token_Request::REMOVE:
       return this->remove (proxy);
     default:
-      ACE_ERROR_RETURN ((LM_ERROR, "invalid type = %d\n",
+      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("invalid type = %d\n"),
                         this->token_request_.operation_type ()), -1);
       /* NOTREACHED */
     }
@@ -433,8 +438,8 @@ ACE_Token_Handler::recv_request (void)
     case -1:
       /* FALLTHROUGH */
     default:
-      ACE_ERROR ((LM_ERROR, "%p got %d bytes, expected %d bytes\n",
-                 "recv failed", n, sizeof (ACE_UINT32)));
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p got %d bytes, expected %d bytes\n"),
+                  ACE_TEXT ("recv failed"), n, sizeof (ACE_UINT32)));
       /* FALLTHROUGH */
     case 0:
       // We've shutdown unexpectedly, let's abandon the connection.
@@ -449,7 +454,7 @@ ACE_Token_Handler::recv_request (void)
         // Do a sanity check on the length of the message.
         if (length > (ssize_t) sizeof this->token_request_)
           {
-            ACE_ERROR ((LM_ERROR, "length %d too long\n", length));
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("length %d too long\n"), length));
             return this->abandon (1);
           }
 
@@ -462,15 +467,16 @@ ACE_Token_Handler::recv_request (void)
         // Subtract off the size of the part we skipped over...
         if (n != (length - (ssize_t) sizeof (ACE_UINT32)))
           {
-            ACE_ERROR ((LM_ERROR, "%p expected %d, got %d\n",
-                       "invalid length", length, n));
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p expected %d, got %d\n"),
+                        ACE_TEXT ("invalid length"), length, n));
             return this->abandon (1);
           }
 
         // Decode the request into host byte order.
         if (this->token_request_.decode () == -1)
           {
-            ACE_ERROR ((LM_ERROR, "%p\n", "decode failed"));
+            ACE_ERROR
+              ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("decode failed")));
             return this->abandon (1);
           }
 
diff --git a/netsvcs/lib/Token_Handler.h b/netsvcs/lib/Token_Handler.h
index c00b8f505fe..519965be182 100644
--- a/netsvcs/lib/Token_Handler.h
+++ b/netsvcs/lib/Token_Handler.h
@@ -268,10 +268,10 @@ class ACE_Token_Acceptor : public ACE_Strategy_Acceptor<ACE_Token_Handler, ACE_S
 {
 public:
   /// Dynamic linking hook.
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Parse svc.conf arguments.
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
 
 private:
   /// The scheduling strategy is designed for Reactive services.
diff --git a/netsvcs/servers/main.cpp b/netsvcs/servers/main.cpp
index b134b8db7c7..6707845c5d3 100644
--- a/netsvcs/servers/main.cpp
+++ b/netsvcs/servers/main.cpp
@@ -41,7 +41,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
           ACE_TCHAR *l_argv[3];
           ACE_TCHAR name_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_NAME_SERVER_PORT_STR;
+            ACE_TEXT ("-p ") ACE_TEXT (ACE_DEFAULT_NAME_SERVER_PORT_STR);
 
           l_argv[0] = name_port;
           l_argv[1] = 0;
@@ -54,7 +54,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                               1);
 
           ACE_TCHAR time_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_TIME_SERVER_PORT_STR;
+            ACE_TEXT ("-p ") ACE_TEXT (ACE_DEFAULT_TIME_SERVER_PORT_STR);
           l_argv[0] = time_port;
           l_argv[1] = 0;
           ACE_Service_Object_Ptr sp_2 = ACE_SVC_INVOKE (ACE_TS_Server_Acceptor);
@@ -79,7 +79,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
           ACE_TCHAR token_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_TOKEN_SERVER_PORT_STR;
+            ACE_TEXT ("-p ") ACE_TEXT (ACE_DEFAULT_TOKEN_SERVER_PORT_STR);
           l_argv[0] = token_port;
           l_argv[1] = 0;
           ACE_Service_Object_Ptr sp_4 = ACE_SVC_INVOKE (ACE_Token_Acceptor);
@@ -92,7 +92,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 #endif /* ACE_HAS_TOKENS_LIBRARY */
 
           ACE_TCHAR thr_logging_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR;
+            ACE_TEXT ("-p ") ACE_TEXT (ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR);
           l_argv[0] = thr_logging_port;
           l_argv[1] = 0;
           ACE_Service_Object_Ptr sp_5 =
@@ -105,7 +105,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                               1);
 
           ACE_TCHAR logging_port[] =
-            ACE_TEXT ("-p ") ACE_DEFAULT_LOGGING_SERVER_PORT_STR;
+            ACE_TEXT ("-p ") ACE_TEXT (ACE_DEFAULT_LOGGING_SERVER_PORT_STR);
           l_argv[0] = logging_port;
           l_argv[1] = 0;
           ACE_Service_Object_Ptr sp_6 =
diff --git a/protocols/ace/RMCast/Acknowledge.cpp b/protocols/ace/RMCast/Acknowledge.cpp
index e4416eedec3..b647a255dad 100644
--- a/protocols/ace/RMCast/Acknowledge.cpp
+++ b/protocols/ace/RMCast/Acknowledge.cpp
@@ -4,6 +4,7 @@
 
 #include "ace/Time_Value.h"     // ACE_Time_Value
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_stdlib.h"   // abort
 #include "ace/OS_NS_sys_time.h" // gettimeofday
 
 #include "Acknowledge.h"
@@ -151,7 +152,7 @@ namespace ACE_RMCast
           if (cond_.wait (&time) == -1)
           {
             if (errno != ETIME)
-              abort ();
+              ACE_OS::abort ();
             else
               break;
           }
diff --git a/protocols/ace/RMCast/Link.cpp b/protocols/ace/RMCast/Link.cpp
index 3a9fdaea2b3..e3379ac1893 100644
--- a/protocols/ace/RMCast/Link.cpp
+++ b/protocols/ace/RMCast/Link.cpp
@@ -3,6 +3,8 @@
 // cvs-id    : $Id$
 
 #include "ace/Time_Value.h"        // ACE_Time_Value
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_sys_socket.h"
 
 #include "Link.h"
@@ -53,8 +55,8 @@ namespace ACE_RMCast
                          reinterpret_cast<sockaddr*> (addr_.get_addr ()),
                          addr_.get_addr_size ()) == -1)
     {
-      perror ("connect: ");
-      abort ();
+      ACE_OS::perror ("connect: ");
+      ACE_OS::abort ();
     }
 
 
@@ -161,7 +163,7 @@ namespace ACE_RMCast
                     (*i).ext_id_, (*i).int_id_->size ()));
       }
 
-      abort ();
+      ACE_OS::abort ();
     }
 
     ssock_.send (os.buffer (), os.length (), addr_);
@@ -216,7 +218,7 @@ namespace ACE_RMCast
         if (r == -1)
         {
           if (errno != ETIME)
-            abort ();
+            ACE_OS::abort ();
         }
         else
         {
@@ -307,7 +309,7 @@ namespace ACE_RMCast
         else
           {
             //cerr << 0 << "unknown profile id " << hdr.id () << endl;
-            abort ();
+            ACE_OS::abort ();
           }
       }
 
@@ -325,6 +327,6 @@ namespace ACE_RMCast
   void Link::
   recv (Message_ptr)
   {
-    abort ();
+    ACE_OS::abort ();
   }
 }
diff --git a/protocols/ace/RMCast/Protocol.h b/protocols/ace/RMCast/Protocol.h
index 5e573238b1f..c0e2797b732 100644
--- a/protocols/ace/RMCast/Protocol.h
+++ b/protocols/ace/RMCast/Protocol.h
@@ -17,6 +17,7 @@
 #include "ace/Null_Mutex.h"
 
 #include "ace/OS_NS_string.h"
+#include "ace/OS_NS_stdlib.h"
 
 #include "Bits.h"
 
@@ -633,7 +634,7 @@ namespace ACE_RMCast
     size (size_t s)
     {
       if (s > capacity_)
-        abort ();
+        ACE_OS::abort ();
 
       size_ = s;
 
diff --git a/protocols/ace/RMCast/Reassemble.cpp b/protocols/ace/RMCast/Reassemble.cpp
index 6d94a3d3cbf..9fa3e0d0167 100644
--- a/protocols/ace/RMCast/Reassemble.cpp
+++ b/protocols/ace/RMCast/Reassemble.cpp
@@ -3,6 +3,7 @@
 // cvs-id    : $Id$
 
 #include "Reassemble.h"
+#include "ace/OS_NS_stdlib.h"
 
 /*
 #include <iostream>
@@ -55,7 +56,7 @@ namespace ACE_RMCast
           //
 
           if (part->num () == 1)
-            abort ();
+            ACE_OS::abort ();
 
 
           Data const* data = static_cast<Data const*> (m->find (Data::id));
@@ -78,7 +79,7 @@ namespace ACE_RMCast
             // Reassembly is complete.
             //
             if (part->total_size () != new_data->size ())
-              abort ();
+              ACE_OS::abort ();
 
             Message_ptr new_msg (new Message ());
 
@@ -101,7 +102,7 @@ namespace ACE_RMCast
         // and forward it up.
         //
         if (map_.find (from, e) != -1)
-          abort ();
+          ACE_OS::abort ();
 
         in_->recv (m);
       }
diff --git a/protocols/ace/RMCast/Retransmit.cpp b/protocols/ace/RMCast/Retransmit.cpp
index a2f8dd96adc..b968908f82b 100644
--- a/protocols/ace/RMCast/Retransmit.cpp
+++ b/protocols/ace/RMCast/Retransmit.cpp
@@ -3,6 +3,7 @@
 // cvs-id    : $Id$
 
 #include "ace/Time_Value.h"     // ACE_Time_Value
+#include "ace/OS_NS_stdlib.h"   // abort
 #include "ace/OS_NS_sys_time.h" // gettimeofday
 
 #include "Retransmit.h"
@@ -144,7 +145,7 @@ namespace ACE_RMCast
         if (cond_.wait (&time) == -1)
         {
           if (errno != ETIME)
-            abort ();
+            ACE_OS::abort ();
           else
             break;
         }
diff --git a/protocols/ace/RMCast/Socket.cpp b/protocols/ace/RMCast/Socket.cpp
index 448d4692e81..8f433f7c6ed 100644
--- a/protocols/ace/RMCast/Socket.cpp
+++ b/protocols/ace/RMCast/Socket.cpp
@@ -3,6 +3,8 @@
 // cvs-id    : $Id$
 
 #include "ace/OS_Memory.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_time.h" // gettimeofday
@@ -183,7 +185,7 @@ namespace ACE_RMCast
       Message_ptr m;
 
       if (queue_.dequeue_head (m) == -1)
-        abort ();
+        ACE_OS::abort ();
 
 
       if (queue_.is_empty ())
@@ -196,8 +198,8 @@ namespace ACE_RMCast
 
               if (signal_pipe_.recv (&c, 1) != 1)
                 {
-                  perror ("read: ");
-                  abort ();
+                  ACE_OS::perror ("read: ");
+                  ACE_OS::abort ();
                 }
             }
         }
@@ -252,10 +254,10 @@ namespace ACE_RMCast
       Message_ptr m;
 
       if (queue_.dequeue_head (m) == -1)
-        abort ();
+        ACE_OS::abort ();
 
       if (queue_.enqueue_head (m) == -1)
-        abort ();
+        ACE_OS::abort ();
 
       if (m->find (NoData::id) != 0)
         {
@@ -315,7 +317,7 @@ namespace ACE_RMCast
                   if (signal_pipe_.send (&c, 1) != 1)
                     {
                       // perror ("write: ");
-                      abort ();
+                      ACE_OS::abort ();
                     }
                 }
 
diff --git a/protocols/ace/TMCast/Group.cpp b/protocols/ace/TMCast/Group.cpp
index 464533bec2f..29187838a85 100644
--- a/protocols/ace/TMCast/Group.cpp
+++ b/protocols/ace/TMCast/Group.cpp
@@ -8,6 +8,7 @@
 
 // OS primitives
 #include <ace/OS.h>
+#include <ace/OS_NS_stdlib.h>
 #include <ace/Synch.h>
 #include <ace/Time_Value.h>
 #include <ace/SOCK_Dgram_Mcast.h>
@@ -83,7 +84,7 @@ namespace ACE_TMCast
                               this,
                               THR_JOINABLE,
                               &unused,
-                              &thread_) != 0) ::abort ();
+                              &thread_) != 0) ACE_OS::abort ();
     }
 
     virtual ~Scheduler ()
@@ -94,7 +95,7 @@ namespace ACE_TMCast
         in_control_.push (MessagePtr (new Terminate));
       }
 
-      if (ACE_OS::thr_join (thread_, 0) != 0) ::abort ();
+      if (ACE_OS::thr_join (thread_, 0) != 0) ACE_OS::abort ();
 
       // cerr << "Scheduler is down." << endl;
     }
@@ -201,7 +202,7 @@ namespace ACE_TMCast
                 {
                   // cerr << "unknown message type from link listener: "
                   //      << typeid (*m).name () << endl;
-                  abort ();
+                  ACE_OS::abort ();
                 }
               }
 
@@ -396,7 +397,7 @@ namespace ACE_TMCast
             //     << "unexpected message " << typeid (*m).name ()
             //     << " " << typeid (Aborted).name () << endl;
 
-            abort ();
+            ACE_OS::abort ();
           }
         }
 
@@ -439,7 +440,7 @@ namespace ACE_TMCast
             // cerr << "recv: group-scheduler messaging protocol violation. "
             //     << "unexpected message " << typeid (*m).name () << endl;
 
-            abort ();
+            ACE_OS::abort ();
           }
         }
 
diff --git a/protocols/ace/TMCast/LinkListener.hpp b/protocols/ace/TMCast/LinkListener.hpp
index 1dea811cd39..983f7828f3e 100644
--- a/protocols/ace/TMCast/LinkListener.hpp
+++ b/protocols/ace/TMCast/LinkListener.hpp
@@ -4,6 +4,7 @@
 
 // OS primitives
 #include <ace/OS_NS_string.h>
+#include <ace/OS_NS_stdlib.h>
 #include <ace/Synch.h>
 #include <ace/SOCK_Dgram_Mcast.h>
 #include <ace/Refcounted_Auto_Ptr.h>
@@ -80,7 +81,7 @@ namespace ACE_TMCast
                               this,
                               THR_JOINABLE,
                               &unused,
-                              &thread_) != 0) ::abort ();
+                              &thread_) != 0) ACE_OS::abort ();
     }
 
     ~LinkListener ()
@@ -91,7 +92,7 @@ namespace ACE_TMCast
         control_.push (MessagePtr (new Terminate));
       }
 
-      if (ACE_OS::thr_join (thread_, 0) != 0) ::abort ();
+      if (ACE_OS::thr_join (thread_, 0) != 0) ACE_OS::abort ();
 
       // cerr << "Link listener is down." << endl;
     }
diff --git a/protocols/ace/TMCast/TransactionController.hpp b/protocols/ace/TMCast/TransactionController.hpp
index cbeb0f5a7c9..6b0d4281655 100644
--- a/protocols/ace/TMCast/TransactionController.hpp
+++ b/protocols/ace/TMCast/TransactionController.hpp
@@ -3,6 +3,7 @@
 // cvs-id    : $Id$
 
 #include "ace/OS_NS_string.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/Synch.h"
 #include "ace/Refcounted_Auto_Ptr.h"
 
@@ -352,7 +353,7 @@ namespace ACE_TMCast
           // cerr << "Expecting Send but received " << typeid (*m).name ()
           //      << endl;
 
-          ::abort ();
+          ACE_OS::abort ();
         }
 
         current_.id++;
diff --git a/tests/Array_Map_Test.cpp b/tests/Array_Map_Test.cpp
index 32880cea842..791f7280631 100644
--- a/tests/Array_Map_Test.cpp
+++ b/tests/Array_Map_Test.cpp
@@ -285,9 +285,9 @@ index_operator_test (void)
         {
           if ((*n).first  != *letter || (*n).second != *word)
             ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("Key/Datum mismatch:\n"
-                                         "    key \"%c\" should be \"%c\"\n"
-                                         "  datum \"%s\" should be \"%s\"\n"),
+                               ACE_TEXT ("Key/Datum mismatch:\n")
+                               ACE_TEXT ("    key \"%c\" should be \"%c\"\n")
+                               ACE_TEXT ("  datum \"%s\" should be \"%s\"\n"),
                                (*n).first,
                                *letter,
                                (*n).second.c_str (),
@@ -324,9 +324,9 @@ index_operator_test (void)
         {
           if ((*r).first != *letter || (*r).second != *word)
             ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("Key/Datum mismatch:\n"
-                                         "    key \"%c\" should be \"%c\"\n"
-                                         "  datum \"%s\" should be \"%s\"\n"),
+                               ACE_TEXT ("Key/Datum mismatch:\n")
+                               ACE_TEXT ("    key \"%c\" should be \"%c\"\n")
+                               ACE_TEXT ("  datum \"%s\" should be \"%s\"\n"),
                                (*r).first,
                                *letter,
                                (*r).second.c_str (),
diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp
index fec456c2e3f..a628a673112 100644
--- a/tests/CDR_File_Test.cpp
+++ b/tests/CDR_File_Test.cpp
@@ -196,7 +196,7 @@ run_test (int write_file,
       output_cdr << cdr_test;
 
       // Output the data to cout.
-#if defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WINCE) && defined (ACE_LACKS_IOSTREAM_TOTALLY)
       // Since CE does not have ostream, ace_file_stream and output_file() cannot
       // be used.  Just use 'hard-coded' file name here.
       (*ACE_CE_OSTREAM::instance()).open(ACE_TEXT("\\Log\\CDR_File_Test.txt"));
@@ -295,7 +295,7 @@ run_test (int write_file,
       // <CDR_Test> object.
       input_cdr >> temp;
 
-#ifdef ACE_HAS_WINCE
+#if defined (ACE_HAS_WINCE) && defined (ACE_LACKS_IOSTREAM_TOTALLY)
       (*ACE_CE_OSTREAM::instance()) << temp;
 #else
       *ace_file_stream::instance ()->output_file () << temp;
diff --git a/tests/CE_fostream.cpp b/tests/CE_fostream.cpp
index 7ebb9b168d7..45641fb6e77 100644
--- a/tests/CE_fostream.cpp
+++ b/tests/CE_fostream.cpp
@@ -2,8 +2,8 @@
 
 #include "CE_fostream.h"
 
-// This is CE only.
-#if defined (ACE_HAS_WINCE)
+// This is CE only, prior to availability of iostreams (VC 8).
+#if defined (ACE_HAS_WINCE) && defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
 ACE_CE_fostream* ACE_CE_fostream::instance_ = 0;
 
@@ -146,4 +146,4 @@ ACE_CE_fostream& ACE_CE_fostream::operator << (const void* v)
     return *this;
 }
 
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_HAS_WINCE && ACE_LACKS_IOSTREAMS_TOTALLY */
diff --git a/tests/CE_fostream.h b/tests/CE_fostream.h
index b488aaba3b1..9d84d7fc2be 100644
--- a/tests/CE_fostream.h
+++ b/tests/CE_fostream.h
@@ -21,7 +21,7 @@
 
 #include "ace/config-all.h"
 
-#ifdef ACE_HAS_WINCE
+#if defined (ACE_HAS_WINCE) && defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
 #include "ace/Null_Mutex.h"
 #include "ace/Singleton.h"
@@ -101,5 +101,5 @@ private:
 
 typedef ACE_Singleton<ACE_CE_fostream, ACE_Null_Mutex> ACE_CE_OSTREAM;
 
-#endif  // ACE_HAS_WINCE
-#endif  // ACE_CE_fostream_h
+#endif  /* ACE_HAS_WINCE && ACE_LACKS_IOSTREAM_TOTALLY */
+#endif  /* ACE_CE_fostream_h */
diff --git a/tests/MT_SOCK_Test.cpp b/tests/MT_SOCK_Test.cpp
index 951d830867c..eb407f5f596 100644
--- a/tests/MT_SOCK_Test.cpp
+++ b/tests/MT_SOCK_Test.cpp
@@ -99,7 +99,6 @@ client (void *arg)
   for (const char *c = ACE_ALPHABET; *c != '\0'; c++)
     if (cli_stream.send_n (c, 1) == -1)
       {
-#if defined (ACE_WIN64)
         // This is, I believe, more of an issue with WinXP-64 _server_
         // side, but we can trap it here since we know we're connecting
         // to localhost. It appears, though I haven't found documentation
@@ -116,7 +115,6 @@ client (void *arg)
             cli_stream.close ();
             return 0;
           }
-#endif /* ACE_WIN64 */
 
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P|%t) (errno %d) %p\n"), errno,