14 files changed, 4 insertions, 152 deletions
diff --git a/ACE/examples/C++NPv1/README b/ACE/examples/C++NPv1/README
index 25126be99b1..52c29053541 100644
--- a/ACE/examples/C++NPv1/README
+++ b/ACE/examples/C++NPv1/README
@@ -7,7 +7,6 @@ Patterns'' (C++NPv1) by Douglas C. Schmidt and Stephen D. Huston
 
 We have compiled and run these files on the following platforms:
 
-        Sun Solaris 8 on SPARC using Sun Forte 6.
         Redhat Linux 7.1 using g++ 2.96.
         Microsoft Windows 2000 using Microsoft Visual C++ 6.
 
diff --git a/ACE/examples/C++NPv2/README b/ACE/examples/C++NPv2/README
index e741eb64ed8..b9fa446c91b 100644
--- a/ACE/examples/C++NPv2/README
+++ b/ACE/examples/C++NPv2/README
@@ -7,7 +7,6 @@ The files in this directory contain the source code from the book
 
 We have compiled and run these files on the following platforms:
 
-        Sun Solaris 8 on SPARC using Sun Forte 6.
         Redhat Linux 7.1 using g++ 2.96.
         Microsoft Windows 2000 using Microsoft Visual C++ 6.
 
diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/README b/ACE/examples/QOS/Change_Receiver_FlowSpec/README
index 7fab042dd19..5f1c66344dc 100644
--- a/ACE/examples/QOS/Change_Receiver_FlowSpec/README
+++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/README
@@ -6,7 +6,7 @@ A Regression test for ACE QoS features.
 This test implements a simple Receiver-Sender program that ensures
 Quality of Service (QoS) guarantees on the underlying network before
 transmitting data. The program tests the ACE QoS APIs/features. The
-test works for Winsock2 APIs on Win2K as well as RAPI on Solaris.
+test works for Winsock2 APIs on Win2K.
 
 In addition it dynamically changes the receiver flow spec which in
 turn changes the RESV messages sent.
diff --git a/ACE/examples/QOS/Change_Sender_TSpec/README b/ACE/examples/QOS/Change_Sender_TSpec/README
index 6b24dcc704b..34238f4fec4 100644
--- a/ACE/examples/QOS/Change_Sender_TSpec/README
+++ b/ACE/examples/QOS/Change_Sender_TSpec/README
@@ -6,7 +6,7 @@ A Regression test for ACE QoS features.
 This test implements a simple Receiver-Sender program that ensures
 Quality of Service (QoS) guarantees on the underlying network before
 transmitting data. The program tests the ACE QoS APIs/features. The
-test works for Winsock2 APIs on Win2K as well as RAPI on Solaris.
+test works for Winsock2 APIs on Win2K.
 
 In addition it dynamically changes the sender TSpec which in turn
 changes the PATH messages.
diff --git a/ACE/examples/QOS/Diffserv/NOTES.txt b/ACE/examples/QOS/Diffserv/NOTES.txt
index 6009e2fed59..4f88b9e1762 100644
--- a/ACE/examples/QOS/Diffserv/NOTES.txt
+++ b/ACE/examples/QOS/Diffserv/NOTES.txt
@@ -49,9 +49,3 @@ However, FreeBSD seems to be more fussy about the size of the parameter
 you pass into the setsockopt call.  Make sure you get the
 size right, and cast it properly, ie. don't cast a short, or some
 other size.
-
-
-Solaris notes
-=============
-No problems setting DSCP or ECN values.
-
diff --git a/ACE/examples/QOS/Simple/README b/ACE/examples/QOS/Simple/README
index 39aa2fa3abd..5744f0c8099 100644
--- a/ACE/examples/QOS/Simple/README
+++ b/ACE/examples/QOS/Simple/README
@@ -6,7 +6,7 @@ A Regression test for ACE QoS features.
 This test implements a simple Receiver-Sender program that ensures
 Quality of Service (QoS) guarantees on the underlying network before
 transmitting data. The program tests the ACE QoS APIs/features. The
-test works for Winsock2 APIs on Win2K as well as RAPI on Solaris.
+test works for Winsock2 APIs on Win2K.
 
 
 ------------------------------------------------------------------------
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/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp
index 9bd499624d4..249ee30fa74 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp
@@ -1,29 +1,5 @@
 #include "Handle_Broadcast.h"
 
-#if defined (SunOS4)
-extern "C"
-{
-  int init ();
-  int fini ();
-  void __sti__Handle_Broadcast_C_init_();
-  void __std__Handle_Broadcast_C_init_();
-}
-
-int
-init ()
-{
-  __sti__Handle_Broadcast_C_init_();
-  return 0;
-}
-
-int
-fini ()
-{
-  __std__Handle_Broadcast_C_init_();
-  return 0;
-}
-#endif /* SunOS4 */
-
 unsigned short Handle_Broadcast::DEFAULT_PORT = ACE_DEFAULT_BROADCAST_PORT;
 
 #if !defined (__ACE_INLINE__)
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp
index 7eff9d9db0c..cdf7eb650c0 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp
@@ -1,30 +1,5 @@
 #include "Handle_L_FIFO.h"
 
-
-#if defined (SunOS4)
-extern "C"
-{
-  int init ();
-  int fini ();
-  void __sti__Handle_L_FIFO_C_init_();
-  void __std__Handle_L_FIFO_C_init_();
-}
-
-int
-init ()
-{
-  __sti__Handle_L_FIFO_C_init_();
-  return 0;
-}
-
-int
-fini ()
-{
-  __std__Handle_L_FIFO_C_init_();
-  return 0;
-}
-#endif /* SunOS4 */
-
 const ACE_TCHAR *Handle_L_FIFO::DEFAULT_RENDEZVOUS = ACE_TEXT("/tmp/foo_fifo");
 
 #if !defined (__ACE_INLINE__)
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp
index a21a39e6fe1..89c0e227e5a 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp
@@ -1,29 +1,5 @@
 #include "Handle_R_Dgram.h"
 
-#if defined (SunOS4)
-extern "C"
-{
-  int init ();
-  int fini ();
-  void __sti__Handle_R_Dgram_C_init_();
-  void __std__Handle_R_Dgram_C_init_();
-}
-
-int
-init ()
-{
-  __sti__Handle_R_Dgram_C_init_();
-  return 0;
-}
-
-int
-fini ()
-{
-  __std__Handle_R_Dgram_C_init_();
-  return 0;
-}
-#endif /* SunOS4 */
-
 unsigned short Handle_R_Dgram::DEFAULT_PORT = ACE_DEFAULT_SERVER_PORT;
 
 #if !defined (__ACE_INLINE__)
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp
index 8ce2a3214a2..240cb2980ae 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp
@@ -1,31 +1,6 @@
 #include "Handle_R_Stream.h"
 
-#if defined (SunOS4)
-extern "C"
-{
-  int init ();
-  int fini ();
-  void __sti__Handle_R_Stream_C_recv_n_();
-  void __std__Handle_R_Stream_C_recv_n_();
-}
-
-int
-init ()
-{
-  __sti__Handle_R_Stream_C_recv_n_();
-  return 0;
-}
-
-int
-fini ()
-{
-  __std__Handle_R_Stream_C_recv_n_();
-  return 0;
-}
-#endif /* SunOS4 */
-
 // Static variables.
-
 u_short Handle_R_Stream::DEFAULT_PORT = ACE_DEFAULT_SERVER_PORT;
 char *Handle_R_Stream::login_name  = 0;
 char Handle_R_Stream::login[ACE_MAX_USERID];
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp
index 445dc1c05dd..b605faab14f 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp
@@ -1,29 +1,5 @@
 #include "Handle_Timeout.h"
 
-#if defined (SunOS4)
-extern "C"
-{
-  int init ();
-  int fini ();
-  void __sti__Handle_Timeout_C_init_();
-  void __std__Handle_Timeout_C_init_();
-}
-
-int
-init ()
-{
-  __sti__Handle_Timeout_C_init_();
-  return 0;
-}
-
-int
-fini ()
-{
-  __std__Handle_Timeout_C_init_();
-  return 0;
-}
-#endif /* SunOS4 */
-
 #if !defined (__ACE_INLINE__)
 #include "Handle_Timeout.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/examples/Threads/tss1.cpp b/ACE/examples/Threads/tss1.cpp
index 74ab7782476..201aee8885e 100644
--- a/ACE/examples/Threads/tss1.cpp
+++ b/ACE/examples/Threads/tss1.cpp
@@ -24,7 +24,6 @@
 
 #include "thread_specific.h"
 
-// (Sun C++ 4.2 with -O3 won't link if the following is not const.)
 static const int iterations = 100;
 
 // Static variables.
@@ -32,7 +31,6 @@ ACE_MT (ACE_Thread_Mutex Errno::lock_);
 int Errno::flags_;
 
 // This is our thread-specific error handler...
-// (Sun C++ 4.2 with -O3 won't link if the following is static.)
 ACE_TSS<Errno> TSS_Error;
 
 // Keeps track of whether Tester::close () has started.