ChangeLogTag: Sun Jun 13 17:01:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

42 files changed, 159 insertions, 64 deletions

diff --git a/ChangeLog b/ChangeLog
index 0047923d232..2f7cfa7e54c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,59 @@
+Sun Jun 13 17:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/APG/Logging/Callback-2.h:
+        * examples/APG/Sockets/Basic_Robust.cpp:
+        * examples/APG/Sockets/Server.cpp:
+        * examples/C++NPv1/Logging_Client.cpp:
+        * examples/C++NPv2/Client_Logging_Daemon.cpp:
+        * examples/C++NPv2/Logging_Handler.cpp:
+        * examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp:
+        * examples/IPC_SAP/DEV_SAP/writer/writer.cpp:
+        * examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp:
+        * examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.h:
+        * examples/IPC_SAP/SPIPE_SAP/NPClient.cpp:
+        * examples/IPC_SAP/SPIPE_SAP/NPServer.cpp:
+        * examples/Logger/client/logging_app.cpp:
+        * examples/Logger/simple-server/Logging_Handler.cpp:
+        * examples/OS/Process/imore.cpp:
+        * examples/QOS/Diffserv/diffserv_test.cpp:
+        * examples/RMCast/Send_File/Receiver.cpp:
+        * examples/RMCast/Send_File/Sender.cpp:
+        * examples/Reactor/Dgram/CODgram.cpp:
+        * examples/Reactor/FIFO/client.cpp:
+        * examples/Reactor/FIFO/server.cpp:
+        * examples/Reactor/Misc/test_demuxing.cpp:
+        * examples/Reactor/Proactor/test_cancel.cpp:
+        * examples/Reactor/Proactor/test_multiple_loops.cpp:
+        * examples/Reactor/Proactor/test_proactor.cpp:
+        * examples/Reactor/WFMO_Reactor/Registry_Changes.cpp:
+          Added needed includes. I am working on changing checks for
+          ACE_LACKS_INLINE_FUNCTIONS by checks for __ACE_INLINE_ in ACE,
+          so that we can enabled/disable inlining completely in ACE. As a
+          result of this I reduced some header file dependencies and now
+          some tests need more includes. More of these changes will follow.
+
+        * examples/APG/Logging/Use_LogManager.cpp:
+        * examples/APG/Timers/PTimerDispatcher.cpp:
+        * examples/APG/Timers/TimerDispatcher.cpp:
+        * examples/C++NPv2/TP_Logging_Server.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp:
+        * examples/Logger/simple-server/server_loggerd.cpp:
+        * examples/Logger/Acceptor-server/server_loggerd.cpp:
+        * examples/Threads/auto_event.cpp:
+        * examples/Threads/tss2.cpp:
+          To make things easier to maintenance use the new
+          ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION macro to check
+          whether we need to explicit instantiate static template members.
+          This macro is set for the GNU compiler for AIX, HPUX and VxWorks.
+
+        * examples/APG/Shared_Memory/Hash_Map.cpp:
+        * examples/APG/Shared_Memory/Malloc.cpp:
+        * examples/APG/Shared_Memory/PI_Malloc.cpp:
+        * examples/APG/Shared_Memory/Pool_Growth.cpp:
+          Fixes for wchar builds
+
 Sun Jun 13 16:53:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/generate_footprint_chart.sh:
diff --git a/examples/APG/Logging/Callback-2.h b/examples/APG/Logging/Callback-2.h
index bd07db02cfc..f2c124896b1 100644
--- a/examples/APG/Logging/Callback-2.h
+++ b/examples/APG/Logging/Callback-2.h
@@ -5,6 +5,7 @@
 #include "ace/Log_Msg_Callback.h"
 #include "ace/Log_Record.h"
 #include "ace/SString.h"
+#include "ace/Time_Value.h"
 
 class Callback : public ACE_Log_Msg_Callback
 {
diff --git a/examples/APG/Logging/Use_LogManager.cpp b/examples/APG/Logging/Use_LogManager.cpp
index 328f00416ee..ad3280b8d4f 100644
--- a/examples/APG/Logging/Use_LogManager.cpp
+++ b/examples/APG/Logging/Use_LogManager.cpp
@@ -30,7 +30,7 @@ void foo (void)
  template class ACE_Singleton<LogManager, ACE_Null_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton<LogManager, ACE_Null_Mutex>
-#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<LogManager, ACE_Null_Mutex> *
   ACE_Singleton<LogManager, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/APG/Shared_Memory/Hash_Map.cpp b/examples/APG/Shared_Memory/Hash_Map.cpp
index b48351e37ce..1a7d85cd9e1 100644
--- a/examples/APG/Shared_Memory/Hash_Map.cpp
+++ b/examples/APG/Shared_Memory/Hash_Map.cpp
@@ -167,7 +167,7 @@ int handle_child (void)
 }
 // Listing 5
 // Listing 3 code/ch17
-int handle_parent (char *cmdLine)
+int handle_parent (ACE_TCHAR *cmdLine)
 {
   ACE_TRACE (ACE_TEXT ("::handle_parent"));
 
diff --git a/examples/APG/Shared_Memory/Malloc.cpp b/examples/APG/Shared_Memory/Malloc.cpp
index e070b783740..27c21f5ea92 100644
--- a/examples/APG/Shared_Memory/Malloc.cpp
+++ b/examples/APG/Shared_Memory/Malloc.cpp
@@ -89,7 +89,7 @@ int addRecords ()
 // Listing 3
 // Listing 4 code/ch17
 // Backing file where the data is kept.
-#define BACKING_STORE "backing.store"
+#define BACKING_STORE ACE_TEXT("backing.store")
 
 int ACE_TMAIN (int argc, ACE_TCHAR *[])
 {
diff --git a/examples/APG/Shared_Memory/PI_Malloc.cpp b/examples/APG/Shared_Memory/PI_Malloc.cpp
index 689bcb75d0a..80120a894da 100644
--- a/examples/APG/Shared_Memory/PI_Malloc.cpp
+++ b/examples/APG/Shared_Memory/PI_Malloc.cpp
@@ -95,7 +95,7 @@ int addRecords (void)
 
 // Listing 3 code/ch17
 // Backing file where the data is kept.
-#define BACKING_STORE "backing2.store"
+#define BACKING_STORE ACE_TEXT("backing2.store")
 
 int ACE_TMAIN (int argc, ACE_TCHAR *[])
 {
diff --git a/examples/APG/Shared_Memory/Pool_Growth.cpp b/examples/APG/Shared_Memory/Pool_Growth.cpp
index 0835413dd9d..c3374602c7b 100644
--- a/examples/APG/Shared_Memory/Pool_Growth.cpp
+++ b/examples/APG/Shared_Memory/Pool_Growth.cpp
@@ -57,7 +57,7 @@ QUEUE* squeue(ALLOCATOR* shmem_allocator)
   // memory-mapped file we know it's already initialized.
   if (shmem_allocator->find (QUEUE_NAME, queue) == 0)
     return (QUEUE *) queue;
-  
+
   // Create a new map (because we've just created a new
   // memory-mapped file).
   size_t queue_size = sizeof (QUEUE);
@@ -76,7 +76,7 @@ QUEUE* squeue(ALLOCATOR* shmem_allocator)
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("squeue bind\n")));
       shmem_allocator->remove();
-        
+
       return 0;
     }
 
@@ -184,7 +184,7 @@ int sendRecord (int recordId,  ALLOCATOR *shmem_allocator)
 }
 
 // Listing 2 code/ch17
-int handle_parent (char *cmdLine)
+int handle_parent (ACE_TCHAR *cmdLine)
 {
   ALLOCATOR *shmem_allocator = 0;
   ACE_MMAP_Memory_Pool_Options options
@@ -200,7 +200,7 @@ int handle_parent (char *cmdLine)
 
   ACE_Process processa, processb;
   ACE_Process_Options poptions;
-  poptions.command_line ("%s a", ACE_TEXT_ALWAYS_CHAR (cmdLine));
+  poptions.command_line ("%s a", cmdLine);
   processa.spawn (poptions);
   processb.spawn (poptions);
 
diff --git a/examples/APG/Sockets/Basic_Robust.cpp b/examples/APG/Sockets/Basic_Robust.cpp
index eee5e75b3a5..4b0f697a8a2 100644
--- a/examples/APG/Sockets/Basic_Robust.cpp
+++ b/examples/APG/Sockets/Basic_Robust.cpp
@@ -5,6 +5,7 @@
 #include "ace/SOCK_Stream.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/Log_Msg.h"
+#include "ace/Time_Value.h"
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
diff --git a/examples/APG/Sockets/Server.cpp b/examples/APG/Sockets/Server.cpp
index dbd21abc717..2a9ca7f4f7b 100644
--- a/examples/APG/Sockets/Server.cpp
+++ b/examples/APG/Sockets/Server.cpp
@@ -6,6 +6,7 @@
 #include "ace/SOCK_Stream.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Log_Msg.h"
+#include "ace/Time_Value.h"
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
diff --git a/examples/APG/Timers/PTimerDispatcher.cpp b/examples/APG/Timers/PTimerDispatcher.cpp
index cbe47be16f0..3198b167725 100644
--- a/examples/APG/Timers/PTimerDispatcher.cpp
+++ b/examples/APG/Timers/PTimerDispatcher.cpp
@@ -67,7 +67,7 @@ PTimer_Dispatcher::reset_interval (long timer_id,
 template class ACE_Singleton <PTimer_Dispatcher, ACE_Null_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton <PTimer_Dispatcher, ACE_Null_Mutex>
-#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<PTimer_Dispatcher, ACE_Null_Mutex> *
       ACE_Singleton<PTimer_Dispatcher, ACE_Null_Mutex>::singleton_;
 # endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/APG/Timers/TimerDispatcher.cpp b/examples/APG/Timers/TimerDispatcher.cpp
index a08ddf4f6b3..b93bd0b2fc5 100644
--- a/examples/APG/Timers/TimerDispatcher.cpp
+++ b/examples/APG/Timers/TimerDispatcher.cpp
@@ -71,7 +71,7 @@ Timer_Dispatcher::reset_interval (long timer_id,
 template class ACE_Singleton <Timer_Dispatcher, ACE_Null_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton <Timer_Dispatcher, ACE_Null_Mutex>
-#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<Timer_Dispatcher, ACE_Null_Mutex> *
       ACE_Singleton<Timer_Dispatcher, ACE_Null_Mutex>::singleton_;
 # endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/C++NPv1/Logging_Client.cpp b/examples/C++NPv1/Logging_Client.cpp
index 85f4afadac2..fe6f65506dd 100644
--- a/examples/C++NPv1/Logging_Client.cpp
+++ b/examples/C++NPv1/Logging_Client.cpp
@@ -11,6 +11,7 @@
 #include "ace/SOCK_Stream.h"
 #include "ace/Log_Msg.h"
 #include "ace/Log_Record.h"
+#include "ace/OS_NS_unistd.h"
 
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
diff --git a/examples/C++NPv2/Client_Logging_Daemon.cpp b/examples/C++NPv2/Client_Logging_Daemon.cpp
index 6d7f3988b2d..cfe4aefa14e 100644
--- a/examples/C++NPv2/Client_Logging_Daemon.cpp
+++ b/examples/C++NPv2/Client_Logging_Daemon.cpp
@@ -6,6 +6,9 @@
 
 #include "ace/os_include/os_netdb.h"
 #include "ace/OS_NS_sys_time.h"
+#include "ace/OS_NS_sys_socket.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_string.h"
 #include "ace/Event_Handler.h"
 #include "ace/INET_Addr.h"
 #include "ace/Get_Opt.h"
@@ -166,7 +169,7 @@ ACE_THR_FUNC_RETURN CLD_Handler::forward () {
       if (errno != EWOULDBLOCK) break;
       else if (message_index == 0) continue;
     } else {
-      if (mblk->size () == 0 
+      if (mblk->size () == 0
           && mblk->msg_type () == ACE_Message_Block::MB_STOP)
         { mblk->release (); break; }
       chunk[message_index] = mblk;
diff --git a/examples/C++NPv2/Logging_Handler.cpp b/examples/C++NPv2/Logging_Handler.cpp
index bcc54b8266d..57e7c336898 100644
--- a/examples/C++NPv2/Logging_Handler.cpp
+++ b/examples/C++NPv2/Logging_Handler.cpp
@@ -15,6 +15,7 @@
 
 #include "Logging_Handler.h"
 #include "ace/os_include/os_netdb.h"
+#include "ace/OS_NS_string.h"
 
 int operator>> (ACE_InputCDR &cdr, ACE_Log_Record &log_record)
 {
diff --git a/examples/C++NPv2/TP_Logging_Server.cpp b/examples/C++NPv2/TP_Logging_Server.cpp
index 085be3a7425..e62c7d9e892 100644
--- a/examples/C++NPv2/TP_Logging_Server.cpp
+++ b/examples/C++NPv2/TP_Logging_Server.cpp
@@ -67,7 +67,7 @@ ACE_FACTORY_DEFINE (TPLS, TP_Logging_Server)
 template class Reactor_Logging_Server<TP_Logging_Acceptor>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate Reactor_Logging_Server<TP_Logging_Acceptor>
-#elif defined (__GNUC__) && defined (_AIX)
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<TP_Logging_Task, ACE_Null_Mutex> *
   ACE_Singleton<TP_Logging_Task, ACE_Null_Mutex>::singleton_;
 template ACE_Unmanaged_Singleton<TP_Logging_Task, ACE_Null_Mutex> *
diff --git a/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp b/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
index 9891f1cc379..505c7d474fc 100644
--- a/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
@@ -11,12 +11,12 @@
 #include "ace/Reactor.h"
 #include "ace/WFMO_Reactor.h"
 #include "ace/Thread_Manager.h"
+#include "ace/OS_NS_string.h"
 
 #include "Reactor_Logging_Server.h"
 #include "Logging_Acceptor_Ex.h"
 #include "Logging_Event_Handler_Ex.h"
 
-
 class Quit_Handler : public ACE_Event_Handler {
 private:
   ACE_Manual_Event quit_seen_;
diff --git a/examples/IPC_SAP/DEV_SAP/writer/writer.cpp b/examples/IPC_SAP/DEV_SAP/writer/writer.cpp
index 68a4e8bd6ec..1c6bc78d087 100644
--- a/examples/IPC_SAP/DEV_SAP/writer/writer.cpp
+++ b/examples/IPC_SAP/DEV_SAP/writer/writer.cpp
@@ -2,10 +2,11 @@
 
 #include "ace/DEV_Connector.h"
 #include "ace/TTY_IO.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(writer, writer, "$Id$")
 
-int 
+int
 main (int argc, char *argv[])
 {
   if (argc < 2)
diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp
index eb31e171725..4cd32c03449 100644
--- a/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp
+++ b/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp
@@ -3,6 +3,7 @@
 #include "ace/FIFO_Recv.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
 #include "ace/OS_main.h"
 
 ACE_RCSID(FIFO_SAP, FIFO_server, "$Id$")
diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp
index 277874db3cd..3b30d0a7612 100644
--- a/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp
+++ b/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp
@@ -10,6 +10,9 @@
 #include "ace/FIFO_Send.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_sys_wait.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_fcntl.h"
 
 ACE_RCSID(FIFO_SAP, FIFO_test, "$Id$")
 
@@ -23,7 +26,7 @@ static int
 do_child (ACE_FIFO_Recv &fifo_reader)
 {
   // Set child's stdin to read from the fifo.
-  if (ACE_OS::close (ACE_STDIN) == -1 
+  if (ACE_OS::close (ACE_STDIN) == -1
       || ACE_OS::dup (fifo_reader.get_handle ()) == ACE_INVALID_HANDLE)
     return -1;
 
@@ -36,7 +39,7 @@ do_child (ACE_FIFO_Recv &fifo_reader)
   return 0;
 }
 
-static int 
+static int
 do_parent (const char fifo_name[],
 	   char input_filename[])
 {
@@ -61,13 +64,13 @@ do_parent (const char fifo_name[],
 
   if (len == -1)
     return -1;
-    
+
   if (fifo_sender.remove () == -1)
     return -1;
   return 0;
 }
 
-int 
+int
 main (int argc, char *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
@@ -108,7 +111,7 @@ main (int argc, char *argv[])
                     1));
 
       // wait for child to ACE_OS::exit.
-      if (ACE_OS::waitpid (child_pid, (ACE_exitcode *) 0, 0) == -1)    
+      if (ACE_OS::waitpid (child_pid, (ACE_exitcode *) 0, 0) == -1)
         ACE_ERROR ((LM_ERROR,
                     "%n: %p\n%a",
                     "waitpid",
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
index bba003e1c39..0f112652030 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
@@ -15,6 +15,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/OS_NS_string.h"
+#include "ace/OS_NS_unistd.h"
 #include "ace/OS_main.h"
 
 ACE_RCSID(SOCK_SAP, CPP_inclient, "$Id$")
@@ -421,7 +422,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 template class ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>
-#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> *
   ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h
index de5f4aac030..7486c70b749 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h
@@ -8,6 +8,7 @@
 
 #include "ace/SOCK_Stream.h"
 #include "ace/Barrier.h"
+#include "ace/Time_Value.h"
 
 class Options
   // = TITLE
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
index 9a85cd865e4..aa42b496efa 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
@@ -582,7 +582,7 @@ template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>
 #pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#elif defined (__GNUC__) && (defined (_AIX)|| defined (__hpux))
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> *
   ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp b/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp
index 49dd6ef6f63..37cfe02c181 100644
--- a/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp
+++ b/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp
@@ -5,6 +5,8 @@
 #include "ace/SPIPE_Connector.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_Memory.h"
 
 ACE_RCSID(SPIPE_SAP, NPClient, "$Id$")
 
diff --git a/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp b/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp
index 3ebe777112b..cb34a10220d 100644
--- a/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp
+++ b/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp
@@ -4,6 +4,7 @@
 #include "ace/SPIPE_Acceptor.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(SPIPE_SAP, NPServer, "$Id$")
 
diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp
index 4743eb37c4a..33c86e85d11 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -233,7 +233,7 @@ template class ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>;
 #pragma instantiate ACE_Singleton<Options, ACE_Null_Mutex>
 #pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 #pragma instantiate ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>
-#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<ACE_Reactor, ACE_Null_Mutex> *
   ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>::singleton_;
 template ACE_Singleton<Options, ACE_Null_Mutex> *
diff --git a/examples/Logger/client/logging_app.cpp b/examples/Logger/client/logging_app.cpp
index 29f0174597d..dadccde4f3b 100644
--- a/examples/Logger/client/logging_app.cpp
+++ b/examples/Logger/client/logging_app.cpp
@@ -8,6 +8,8 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(client, logging_app, "$Id$")
 
@@ -15,7 +17,7 @@ static u_short LOGGER_PORT = ACE_DEFAULT_SERVER_PORT;
 static const char *const LOGGER_HOST = ACE_DEFAULT_SERVER_HOST;
 static const int MAX_ITERATIONS = 10;
 
-int 
+int
 main (int argc, char *argv[])
 {
   const char *logger_host = argc > 1 ? argv[1] : LOGGER_HOST;
@@ -28,11 +30,11 @@ main (int argc, char *argv[])
 
   if (connector.connect (logger, addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  
+
   for (int i = 0; i < max_iterations; i++)
     {
-      ACE_Log_Record log_record (LM_DEBUG, 
-				 ACE_OS::time ((time_t *) 0), 
+      ACE_Log_Record log_record (LM_DEBUG,
+				 ACE_OS::time ((time_t *) 0),
 				 ACE_OS::getpid ());
 
       char buf[BUFSIZ];
diff --git a/examples/Logger/simple-server/Logging_Handler.cpp b/examples/Logger/simple-server/Logging_Handler.cpp
index 3bb62db4c49..72afed83497 100644
--- a/examples/Logger/simple-server/Logging_Handler.cpp
+++ b/examples/Logger/simple-server/Logging_Handler.cpp
@@ -5,6 +5,7 @@
 #include "Logging_Handler.h"
 #include "Reactor_Singleton.h"
 #include "ace/Log_Record.h"
+#include "ace/OS_NS_string.h"
 
 ACE_RCSID(simple_server, Logging_Handler, "$Id$")
 
diff --git a/examples/Logger/simple-server/server_loggerd.cpp b/examples/Logger/simple-server/server_loggerd.cpp
index ba8010ca81a..323eea5b2d1 100644
--- a/examples/Logger/simple-server/server_loggerd.cpp
+++ b/examples/Logger/simple-server/server_loggerd.cpp
@@ -83,7 +83,7 @@ main (int argc, char *argv[])
 template class ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>
-#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<ACE_Reactor, ACE_Null_Mutex> *
   ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/OS/Process/imore.cpp b/examples/OS/Process/imore.cpp
index f050c22b189..3a02e74c5ae 100644
--- a/examples/OS/Process/imore.cpp
+++ b/examples/OS/Process/imore.cpp
@@ -24,6 +24,8 @@
 
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_fcntl.h"
 #include "ace/FIFO_Recv.h"
 #include "ace/FIFO_Send.h"
 #include "ace/Pipe.h"
diff --git a/examples/QOS/Diffserv/diffserv_test.cpp b/examples/QOS/Diffserv/diffserv_test.cpp
index a390d6b4ce1..6fd0d8bca8b 100644
--- a/examples/QOS/Diffserv/diffserv_test.cpp
+++ b/examples/QOS/Diffserv/diffserv_test.cpp
@@ -14,6 +14,8 @@
 #include "ace/SOCK_CODgram.h"
 #include "ace/INET_Addr.h"
 #include "ace/OS_NS_string.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_unistd.h"
 
 #define IPDSFIELD_DSCP_DEFAULT  0x00
 #define IPDSFIELD_DSCP_CS1      0x08
@@ -61,7 +63,7 @@ int dscp [] =
     IPDSFIELD_DSCP_AF41    ,
     IPDSFIELD_DSCP_AF42    ,
     IPDSFIELD_DSCP_AF43    ,
-    IPDSFIELD_DSCP_EF      
+    IPDSFIELD_DSCP_EF
   };
 
 const char *dscp_char[]=
@@ -114,21 +116,21 @@ main(int argc , char *argv[])
     {
       opt = dscp[i] << 2;
       ret = sock.set_option(IPPROTO_IP, IP_TOS, (int *)&opt, (int)sizeof(opt) );
-      if(ret == -1){ 
-        ACE_DEBUG((LM_DEBUG, "setsockopt error: %m\n")); 
+      if(ret == -1){
+        ACE_DEBUG((LM_DEBUG, "setsockopt error: %m\n"));
       }
 
       for (int j=0; j<3; j++)
         {
           ret2 = sock.send(buf, ACE_OS::strlen(buf));
-          if(ret2 == -1){ 
-            ACE_DEBUG((LM_DEBUG, "send error: %m\n")); 
+          if(ret2 == -1){
+            ACE_DEBUG((LM_DEBUG, "send error: %m\n"));
           }
           printf("opt: %u dscp: %u, %s,  setsockopt returned: %d, send returned: %d\n", opt, opt >> 2, dscp_char[i], ret, ret2);
           ACE_OS::sleep(1);
         }
     }
 
-  ACE_OS::free(buf);  
+  ACE_OS::free(buf);
   return 0;
 }
diff --git a/examples/RMCast/Send_File/Receiver.cpp b/examples/RMCast/Send_File/Receiver.cpp
index 9e305d5f3cd..80ac7be26bd 100644
--- a/examples/RMCast/Send_File/Receiver.cpp
+++ b/examples/RMCast/Send_File/Receiver.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/OS_main.h"
+#include "ace/OS_NS_fcntl.h"
 #include "ace/RMCast/RMCast_UDP_Reliable_Receiver.h"
 #include "ace/INET_Addr.h"
 #include "ace/FILE_IO.h"
diff --git a/examples/RMCast/Send_File/Sender.cpp b/examples/RMCast/Send_File/Sender.cpp
index 94d270dd4ee..ec6e3e43642 100644
--- a/examples/RMCast/Send_File/Sender.cpp
+++ b/examples/RMCast/Send_File/Sender.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #include "ace/OS_main.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_fcntl.h"
 #include "ace/RMCast/RMCast_UDP_Reliable_Sender.h"
 #include "ace/INET_Addr.h"
 #include "ace/FILE_IO.h"
@@ -32,7 +34,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   if (mcast_group.set (argv[2]) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "Cannot setup multicast group <%s>\n", 
+                         "Cannot setup multicast group <%s>\n",
                          argv[2]),
                         1);
     }
diff --git a/examples/Reactor/Dgram/CODgram.cpp b/examples/Reactor/Dgram/CODgram.cpp
index e9a9250579d..f423c43fb8c 100644
--- a/examples/Reactor/Dgram/CODgram.cpp
+++ b/examples/Reactor/Dgram/CODgram.cpp
@@ -27,6 +27,7 @@
 
 #include "ace/OS_main.h"
 #include "ace/OS_NS_string.h"
+#include "ace/OS_NS_unistd.h"
 #include "ace/Reactor.h"
 #include "ace/SOCK_CODgram.h"
 #include "ace/INET_Addr.h"
diff --git a/examples/Reactor/FIFO/client.cpp b/examples/Reactor/FIFO/client.cpp
index 92e0dee7bab..c4737d16db4 100644
--- a/examples/Reactor/FIFO/client.cpp
+++ b/examples/Reactor/FIFO/client.cpp
@@ -2,17 +2,18 @@
 
 #include "ace/FIFO_Send_Msg.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stropts.h"
 
 ACE_RCSID(FIFO, client, "$Id$")
 
-int 
+int
 main (int, char *[])
 {
   char buf[] = "hello world";
   ACE_Str_Buf msg (buf, sizeof buf);
 
-  ACE_FIFO_Send_Msg fifo_sender (ACE_DEFAULT_RENDEZVOUS, 
-				 O_WRONLY | O_CREAT, 
+  ACE_FIFO_Send_Msg fifo_sender (ACE_DEFAULT_RENDEZVOUS,
+				 O_WRONLY | O_CREAT,
 				 ACE_DEFAULT_FILE_PERMS);
 
   if (fifo_sender.send (msg) == -1)
diff --git a/examples/Reactor/FIFO/server.cpp b/examples/Reactor/FIFO/server.cpp
index 3147cf74a74..108f51a7ffc 100644
--- a/examples/Reactor/FIFO/server.cpp
+++ b/examples/Reactor/FIFO/server.cpp
@@ -3,6 +3,8 @@
 #include "ace/Service_Config.h"
 #include "ace/FIFO_Recv_Msg.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_stropts.h"
 
 ACE_RCSID(FIFO, server, "$Id$")
 
@@ -11,7 +13,7 @@ class FIFO_Recv_Handler : public ACE_Event_Handler
 public:
   FIFO_Recv_Handler (void);
   ~FIFO_Recv_Handler (void);
-  
+
   virtual ACE_HANDLE get_handle (void) const;
   virtual int handle_input (ACE_HANDLE fd);
 
@@ -29,12 +31,12 @@ FIFO_Recv_Handler::FIFO_Recv_Handler (void)
     ACE_ERROR ((LM_ERROR, "%p\n", "open"));
 
   // Register with the Reactor.
-  if (ACE_Reactor::instance ()->register_handler 
+  if (ACE_Reactor::instance ()->register_handler
       (this, ACE_Event_Handler::READ_MASK) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
 }
 
-ACE_HANDLE 
+ACE_HANDLE
 FIFO_Recv_Handler::get_handle (void) const
 {
   return this->fifo_reader_.get_handle ();
@@ -50,7 +52,7 @@ int
 FIFO_Recv_Handler::handle_input (ACE_HANDLE)
 {
   char buf[BUFSIZ];
-  
+
   ACE_DEBUG ((LM_DEBUG, "handle_input\n"));
 
   ACE_Str_Buf msg (buf, 0, sizeof buf);
@@ -68,14 +70,14 @@ FIFO_Recv_Handler::handle_input (ACE_HANDLE)
 	  // Do some work in here...
 	  ACE_DEBUG ((LM_DEBUG, "msg.buf = %s\n", msg.buf));
 	}
-      return 0;  
+      return 0;
     }
 }
 
-int 
+int
 main (int, char *argv[])
 {
-  ACE_Service_Config daemon (argv[0]); 
+  ACE_Service_Config daemon (argv[0]);
 
   FIFO_Recv_Handler fr_handler;
 
diff --git a/examples/Reactor/Misc/test_demuxing.cpp b/examples/Reactor/Misc/test_demuxing.cpp
index 4dc3123d65e..a29a99dfdc8 100644
--- a/examples/Reactor/Misc/test_demuxing.cpp
+++ b/examples/Reactor/Misc/test_demuxing.cpp
@@ -13,6 +13,8 @@
 #include "ace/Task.h"
 #include "ace/Reactor_Notification_Strategy.h"
 #include "ace/Signal.h"
+#include "ace/OS_NS_fcntl.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(Misc, test_demuxing, "$Id$")
 
diff --git a/examples/Reactor/Proactor/test_cancel.cpp b/examples/Reactor/Proactor/test_cancel.cpp
index 40afef16dba..99b3b139bdb 100644
--- a/examples/Reactor/Proactor/test_cancel.cpp
+++ b/examples/Reactor/Proactor/test_cancel.cpp
@@ -48,6 +48,7 @@
 #include "ace/Message_Block.h"
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_sys_socket.h"
 
 ACE_RCSID (Proactor, test_proactor, "$Id$")
 
diff --git a/examples/Reactor/Proactor/test_multiple_loops.cpp b/examples/Reactor/Proactor/test_multiple_loops.cpp
index a63e0ce3314..ce40a117b3b 100644
--- a/examples/Reactor/Proactor/test_multiple_loops.cpp
+++ b/examples/Reactor/Proactor/test_multiple_loops.cpp
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    examples
-// 
+//
 // = FILENAME
 //    test_multiple_loops.cpp
 //
@@ -16,13 +16,14 @@
 //
 // = AUTHOR
 //    Irfan Pyarali
-// 
+//
 // ============================================================================
 
 #include "ace/Task.h"
 #include "ace/Proactor.h"
 #include "ace/WIN32_Proactor.h"
 #include "ace/Atomic_Op.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(Proactor, test_multiple_loops, "$Id$")
 
@@ -32,18 +33,18 @@ class Timeout_Handler : public ACE_Handler, public ACE_Event_Handler
 {
   // = TITLE
   //     Generic timeout handler.
-  
+
 public:
-  Timeout_Handler (void) 
-    { 
+  Timeout_Handler (void)
+    {
     }
-  
+
   // This is called by the Proactor. This is declared in ACE_Handler.
   virtual void handle_time_out (const ACE_Time_Value &tv,
                                 const void *arg)
     {
       // Print out when timeouts occur.
-      ACE_DEBUG ((LM_DEBUG, "(%t) %d timeout occurred for %s @ %d.\n", 
+      ACE_DEBUG ((LM_DEBUG, "(%t) %d timeout occurred for %s @ %d.\n",
 		  ++count_,
 		  (char *) arg,
 		  tv.sec ()));
@@ -63,7 +64,7 @@ public:
       this->handle_time_out (tv, arg);
       return 0;
     }
-  
+
 private:
   ACE_Atomic_Op <ACE_Thread_Mutex, int> count_;
 };
@@ -71,23 +72,23 @@ private:
 class Worker : public ACE_Task <ACE_NULL_SYNCH>
 {
 public:
-  
+
   // Thread fuction.
   int svc (void)
     {
       ACE_DEBUG ((LM_DEBUG, "(%t) Worker started\n"));
-      
+
       // Handle events for 13 seconds.
       ACE_Time_Value run_time (13);
-      
+
       // Try to become the owner
       ACE_Reactor::instance ()->owner (ACE_Thread::self ());
-      
+
       if (ACE_Reactor::run_event_loop (run_time) == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "Worker::svc"), -1);
       else
         ACE_DEBUG ((LM_DEBUG, "(%t) work complete\n"));
-      
+
       return 0;
     }
 };
@@ -98,9 +99,9 @@ main (int, char *[])
   Timeout_Handler handler;
   ACE_WIN32_Proactor win32_proactor (0, 1);
   ACE_Proactor proactor (&win32_proactor, 0, 0);
-  
+
   ACE_Reactor::instance ()->register_handler (proactor.implementation ());
-  
+
   // Register a 2 second timer.
   ACE_Time_Value foo_tv (2);
   if (proactor.schedule_timer (handler,
@@ -121,11 +122,11 @@ main (int, char *[])
 
   if (worker.activate (THR_NEW_LWP, 10) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "main"), -1);
-  
+
   ACE_Thread_Manager::instance ()->wait ();
 
   // Remove from reactor
-  ACE_Reactor::instance ()->remove_handler (&proactor, 
+  ACE_Reactor::instance ()->remove_handler (&proactor,
                                             ACE_Event_Handler::DONT_CALL);
 
   return 0;
diff --git a/examples/Reactor/Proactor/test_proactor.cpp b/examples/Reactor/Proactor/test_proactor.cpp
index 837853ace27..a4f39c8d795 100644
--- a/examples/Reactor/Proactor/test_proactor.cpp
+++ b/examples/Reactor/Proactor/test_proactor.cpp
@@ -33,7 +33,9 @@
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_sys_stat.h"
-
+#include "ace/OS_NS_sys_socket.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_fcntl.h"
 
 ACE_RCSID(Proactor, test_proactor, "$Id$")
 
diff --git a/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp b/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
index 8e6a023ce1f..be787293e65 100644
--- a/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
+++ b/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
@@ -25,6 +25,7 @@
 #include "ace/Reactor.h"
 #include "ace/Registry.h"
 #include "ace/Auto_Event.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(WFMO_Reactor, Registry_Changes, "$Id$")
 
diff --git a/examples/Threads/auto_event.cpp b/examples/Threads/auto_event.cpp
index cf3036df290..29e923180e6 100644
--- a/examples/Threads/auto_event.cpp
+++ b/examples/Threads/auto_event.cpp
@@ -108,7 +108,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
 template class ACE_Singleton<ACE_Auto_Event, ACE_Thread_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton<ACE_Auto_Event, ACE_Thread_Mutex>
-#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<ACE_Auto_Event, ACE_Thread_Mutex> *
   ACE_Singleton<ACE_Auto_Event, ACE_Thread_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Threads/tss2.cpp b/examples/Threads/tss2.cpp
index 59b52fe59ca..27f7aa4f369 100644
--- a/examples/Threads/tss2.cpp
+++ b/examples/Threads/tss2.cpp
@@ -194,7 +194,7 @@ template class ACE_TSS_Singleton<TSS_Data, ACE_SYNCH_MUTEX>;
 #pragma instantiate ACE_TSS<TSS_Data>
 #pragma instantiate ACE_TSS<TSS_Obj>
 #pragma instantiate ACE_TSS_Singleton<TSS_Data, ACE_SYNCH_MUTEX>
-#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_TSS_Singleton<TSS_Data, ACE_SYNCH_MUTEX> *
   ACE_TSS_Singleton<TSS_Data, ACE_SYNCH_MUTEX>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */