4 files changed, 3 insertions, 19 deletions
diff --git a/ACE/examples/Reactor/Proactor/test_cancel.cpp b/ACE/examples/Reactor/Proactor/test_cancel.cpp
index 3ee661d9b30..8dfb8259e16 100644
--- a/ACE/examples/Reactor/Proactor/test_cancel.cpp
+++ b/ACE/examples/Reactor/Proactor/test_cancel.cpp
@@ -13,10 +13,7 @@
  *  cancel the operation and so the program exits closing the
  *  connection.
  *
- *  Works fine on NT. On Solaris platforms, the asynch read is
- *  pending, but the cancel returns with the value <AIO_ALLDONE>
- *  indicating all the operations in that handle are done.
- *  But, LynxOS has a good <aio_cancel> implementation. It works
+ *  Works fine on NT. LynxOS has a good <aio_cancel> implementation. It works
  *  fine.
  *
  * = RUN
diff --git a/ACE/examples/Reactor/Proactor/test_proactor3.cpp b/ACE/examples/Reactor/Proactor/test_proactor3.cpp
index 369d3699737..68542f46080 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor3.cpp
+++ b/ACE/examples/Reactor/Proactor/test_proactor3.cpp
@@ -44,7 +44,6 @@
 #elif defined (ACE_HAS_AIO_CALLS)
 
 #include "ace/POSIX_Proactor.h"
-#include "ace/SUN_Proactor.h"
 
 #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 
@@ -128,12 +127,6 @@ MyTask::create_proactor ()
           proactor = new ACE_POSIX_SIG_Proactor;
           ACE_DEBUG ((LM_DEBUG,"(%t) Create Proactor Type=SIG\n"));
           break;
-#  if defined (sun)
-        case 3:
-          proactor = new ACE_SUN_Proactor (max_aio_operations);
-          ACE_DEBUG ((LM_DEBUG,"(%t) Create Proactor Type=SUN\n"));
-          break;
-#  endif /* sun */
         default:
           proactor = new ACE_POSIX_SIG_Proactor;
           ACE_DEBUG ((LM_DEBUG,"(%t) Create Proactor Type=SIG\n"));
@@ -671,9 +664,6 @@ set_proactor_type (const char *ptype)
     case 'D' :  proactor_type = 0; return true;
     case 'A' :  proactor_type = 1; return true;
     case 'I' :  proactor_type = 2; return true;
-#if defined (sun)
-    case 'S' :  proactor_type = 3; return true;
-#endif /* sun */
     }
   return false;
 }
@@ -737,9 +727,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-#if defined (sun)
-  ACE_DEBUG ((LM_DEBUG, "\nSUN defined!\n"));
-#endif
   if (parse_args (argc, argv) == -1)
     return -1;
 
diff --git a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp
index 49775b0ef68..00d21aa59c5 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp
@@ -12,7 +12,7 @@
 
 #include "ace/OS_main.h"
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && _WIN32_WINNT >= 0x400
+#if defined (ACE_WIN32) && _WIN32_WINNT >= 0x400
 
 #include "ace/Reactor.h"
 #include "ace/Auto_Event.h"
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
index 78035c00323..9a2a4840559 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
@@ -209,7 +209,7 @@ create_reactor ()
 
   if (opt_wfmo_reactor)
     {
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32)
       ACE_NEW_RETURN (impl,
                       ACE_WFMO_Reactor,
                       0);