Mon Sep 13 09:25:22 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

* bin/generate_doxygen.pl: Updated for DAnCE move * ace/ETCL/ETCL_Constraint.cpp: * ace/ETCL/ETCL_l.cpp.diff: * ace/ETCL/ETCL_l.cpp: * ace/Makefile.am: * ace/Thread_Control.inl: * ace/ace.mpc: * ace/ace_for_tao.mpc: * apps/JAWS3/bench/average.cpp: * apps/JAWS3/bench/mkfiles.cpp: * apps/JAWS3/bench/rqfiles.cpp: * apps/JAWS3/http/HTTP_Data.h: * apps/JAWS3/http/HTTP_Service_Handler.h: * apps/JAWS3/http/HTTP_Service_Handler.cpp: * apps/JAWS3/http/HTTP_States.h: * apps/JAWS3/jaws3-todo/Reactive_Socket.h: * apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.h: * apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.cpp: * apps/JAWS3/jaws3-todo/Socket.h: * apps/JAWS3/jaws3/Concurrency_T.h: * apps/JAWS3/small/SS_Data.h: * apps/JAWS3/small/SS_Service_Handler.h: * apps/JAWS3/small/SS_Service_Handler.cpp: * apps/JAWS3/small/SS_State_DONE.h: * apps/JAWS3/small/SS_State_DONE.cpp: * apps/JAWS3/small/SS_State_ERROR.h: * apps/JAWS3/small/SS_State_ERROR.cpp: * apps/JAWS3/small/SS_State_PARSE.h: * apps/JAWS3/small/SS_State_PARSE.cpp: * apps/JAWS3/small/SS_State_READ.h: * apps/JAWS3/small/SS_State_READ.cpp: * apps/JAWS3/small/SS_State_WRITE.h: * apps/JAWS3/small/SS_State_WRITE.cpp: * apps/JAWS3/small/SS_Templates.cpp: * contrib/FaCE/FaCE.h: * examples/APG/Svc_Config/HA_Status_Dynamic.h: * examples/APG/Svc_Config/HA_Status_Static.h: * examples/Reactor/TP_Reactor/client.cpp: * examples/Reactor/TP_Reactor/server.cpp: * protocols/ace/HTBP/HTBP_Channel.cpp: * protocols/ace/HTBP/HTBP_Filter.h: * protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp: * protocols/ace/HTBP/HTBP_Session.cpp: * protocols/ace/TMCast/Group.cpp: * protocols/examples/RMCast/Send_Msg/Sender.cpp: * protocols/tests/HTBP/Reactor_Tests/client.cpp: * protocols/tests/HTBP/Reactor_Tests/server.cpp: * protocols/tests/HTBP/Reactor_Tests/test_config.h: * protocols/tests/HTBP/Send_Large_Msg/client.cpp: * protocols/tests/HTBP/Send_Large_Msg/server.cpp: * protocols/tests/HTBP/Send_Recv_Tests/client.cpp: * protocols/tests/HTBP/Send_Recv_Tests/server.cpp: * protocols/tests/HTBP/ping/client.cpp: * protocols/tests/HTBP/ping/server.cpp: * protocols/tests/RMCast/Sender.cpp: * tests/Based_Pointer_Test.cpp: * tests/Bug_2980_Regression_Dll.cpp: * tests/SSL/Bug_2912_Regression_Test.cpp: Removed include of ace/OS.h, only in a few files we really had to add an include of OS_NS_*.h * ace/OS.h: * ace/OS.inl: * ace/OS.cpp: Removed these files, replaced with OS_NS_* files a long time ago
author: Johnny Willemsen <jwillemsen@remedy.nl> 2010-09-13 09:31:11 +0000
committer: Johnny Willemsen <jwillemsen@remedy.nl> 2010-09-13 09:31:11 +0000
commit: fb798abe4310e88b47dd9013eb398aeccf3cb9a4 (patch)
tree: 5ba609a185367cc44a0fd441d960e0ec24b64a37
parent: 45f0f0cf6fdfdd6065ae2301d45a2ec0036b6d11 (diff)
download: ATCD-fb798abe4310e88b47dd9013eb398aeccf3cb9a4.tar.gz
63 files changed, 102 insertions, 533 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index fb41c162442..31dd4a31f11 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,73 @@
+Mon Sep 13 09:25:22 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/generate_doxygen.pl:
+          Updated for DAnCE move
+
+        * ace/ETCL/ETCL_Constraint.cpp:
+        * ace/ETCL/ETCL_l.cpp.diff:
+        * ace/ETCL/ETCL_l.cpp:
+        * ace/Makefile.am:
+        * ace/Thread_Control.inl:
+        * ace/ace.mpc:
+        * ace/ace_for_tao.mpc:
+        * apps/JAWS3/bench/average.cpp:
+        * apps/JAWS3/bench/mkfiles.cpp:
+        * apps/JAWS3/bench/rqfiles.cpp:
+        * apps/JAWS3/http/HTTP_Data.h:
+        * apps/JAWS3/http/HTTP_Service_Handler.h:
+        * apps/JAWS3/http/HTTP_Service_Handler.cpp:
+        * apps/JAWS3/http/HTTP_States.h:
+        * apps/JAWS3/jaws3-todo/Reactive_Socket.h:
+        * apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.h:
+        * apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.cpp:
+        * apps/JAWS3/jaws3-todo/Socket.h:
+        * apps/JAWS3/jaws3/Concurrency_T.h:
+        * apps/JAWS3/small/SS_Data.h:
+        * apps/JAWS3/small/SS_Service_Handler.h:
+        * apps/JAWS3/small/SS_Service_Handler.cpp:
+        * apps/JAWS3/small/SS_State_DONE.h:
+        * apps/JAWS3/small/SS_State_DONE.cpp:
+        * apps/JAWS3/small/SS_State_ERROR.h:
+        * apps/JAWS3/small/SS_State_ERROR.cpp:
+        * apps/JAWS3/small/SS_State_PARSE.h:
+        * apps/JAWS3/small/SS_State_PARSE.cpp:
+        * apps/JAWS3/small/SS_State_READ.h:
+        * apps/JAWS3/small/SS_State_READ.cpp:
+        * apps/JAWS3/small/SS_State_WRITE.h:
+        * apps/JAWS3/small/SS_State_WRITE.cpp:
+        * apps/JAWS3/small/SS_Templates.cpp:
+        * contrib/FaCE/FaCE.h:
+        * examples/APG/Svc_Config/HA_Status_Dynamic.h:
+        * examples/APG/Svc_Config/HA_Status_Static.h:
+        * examples/Reactor/TP_Reactor/client.cpp:
+        * examples/Reactor/TP_Reactor/server.cpp:
+        * protocols/ace/HTBP/HTBP_Channel.cpp:
+        * protocols/ace/HTBP/HTBP_Filter.h:
+        * protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp:
+        * protocols/ace/HTBP/HTBP_Session.cpp:
+        * protocols/ace/TMCast/Group.cpp:
+        * protocols/examples/RMCast/Send_Msg/Sender.cpp:
+        * protocols/tests/HTBP/Reactor_Tests/client.cpp:
+        * protocols/tests/HTBP/Reactor_Tests/server.cpp:
+        * protocols/tests/HTBP/Reactor_Tests/test_config.h:
+        * protocols/tests/HTBP/Send_Large_Msg/client.cpp:
+        * protocols/tests/HTBP/Send_Large_Msg/server.cpp:
+        * protocols/tests/HTBP/Send_Recv_Tests/client.cpp:
+        * protocols/tests/HTBP/Send_Recv_Tests/server.cpp:
+        * protocols/tests/HTBP/ping/client.cpp:
+        * protocols/tests/HTBP/ping/server.cpp:
+        * protocols/tests/RMCast/Sender.cpp:
+        * tests/Based_Pointer_Test.cpp:
+        * tests/Bug_2980_Regression_Dll.cpp:
+        * tests/SSL/Bug_2912_Regression_Test.cpp:
+          Removed include of ace/OS.h, only in a few files we really had
+          to add an include of OS_NS_*.h
+
+        * ace/OS.h:
+        * ace/OS.inl:
+        * ace/OS.cpp:
+          Removed these files, replaced with OS_NS_* files a long time ago
+
 Sun Sep 12 19:27:58 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * bin/make_release.py:
diff --git a/ACE/ace/ETCL/ETCL_Constraint.cpp b/ACE/ace/ETCL/ETCL_Constraint.cpp
index ff711a9849d..7ab1e930aa2 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.cpp
+++ b/ACE/ace/ETCL/ETCL_Constraint.cpp
@@ -38,17 +38,13 @@ ETCL_Literal_Constraint::ETCL_Literal_Constraint (
 }
 
 ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    ACE_CDR::ULong uinteger
-  )
-  : type_ (ACE_ETCL_UNSIGNED)
+    ACE_CDR::ULong uinteger) : type_ (ACE_ETCL_UNSIGNED)
 {
   this->op_.uinteger_ = uinteger;
 }
 
 ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    ACE_CDR::Long integer
-  )
-  : type_ (ACE_ETCL_SIGNED)
+    ACE_CDR::Long integer) : type_ (ACE_ETCL_SIGNED)
 {
   this->op_.integer_ = integer;
 }
@@ -62,17 +58,13 @@ ETCL_Literal_Constraint::ETCL_Literal_Constraint (
 }
 
 ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    ACE_CDR::Double doub
-  )
-  : type_ (ACE_ETCL_DOUBLE)
+    ACE_CDR::Double doub) : type_ (ACE_ETCL_DOUBLE)
 {
   this->op_.double_ = doub;
 }
 
 ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    const char* str
-  )
-  : type_ (ACE_ETCL_STRING)
+    const char* str) : type_ (ACE_ETCL_STRING)
 {
   this->op_.str_ = ACE::strnew (str);
 }
diff --git a/ACE/ace/ETCL/ETCL_l.cpp b/ACE/ace/ETCL/ETCL_l.cpp
index bb343092dfc..d87f2aa72a9 100644
--- a/ACE/ace/ETCL/ETCL_l.cpp
+++ b/ACE/ace/ETCL/ETCL_l.cpp
@@ -17,12 +17,13 @@
 #endif
 #endif
 
-#include "ace/OS.h"
-
 #include "ace/ETCL/ETCL_Constraint.h"
 
 #ifdef __cplusplus
 
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_stdio.h"
+
 /* Use prototypes in function declarations. */
 #define YY_USE_PROTOS
 
diff --git a/ACE/ace/ETCL/ETCL_l.cpp.diff b/ACE/ace/ETCL/ETCL_l.cpp.diff
index 2948f90be4f..2365305100d 100644
--- a/ACE/ace/ETCL/ETCL_l.cpp.diff
+++ b/ACE/ace/ETCL/ETCL_l.cpp.diff
@@ -24,7 +24,8 @@
 
 -#include <stdlib.h>
 -#include <unistd.h>
-+#include "ace/OS.h"
++#include "ace/OS_NS_unistd.h"
++#include "ace/OS_NS_stdio.h"
 
  /* Use prototypes in function declarations. */
  #define YY_USE_PROTOS
diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am
index 6c33adbed2e..2b6433d1889 100644
--- a/ACE/ace/Makefile.am
+++ b/ACE/ace/Makefile.am
@@ -738,8 +738,6 @@ nobase_include_HEADERS += \
   Null_Semaphore.h \
   Numeric_Limits.h \
   Obstack.h \
-  OS.h \
-  OS.inl \
   OS_Errno.h \
   OS_Errno.inl \
   OS_Log_Msg_Attributes.h \
diff --git a/ACE/ace/OS.cpp b/ACE/ace/OS.cpp
deleted file mode 100644
index afbabdaf0f7..00000000000
--- a/ACE/ace/OS.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-
-// FUZZ: disable check_for_OS_h_include
-#include "ace/OS.h"
-
-#if !defined (ACE_HAS_WINCE)
-# include "ace/OS_QoS.h"
-#endif  // ACE_HAS_WINCE
-
-// Perhaps we should *always* include ace/OS.i in order to make sure
-// we can always link against the OS symbols?
-#if !defined (ACE_HAS_INLINED_OSCALLS)
-# include "ace/OS.inl"
-#endif /* ACE_HAS_INLINED_OSCALLS */
-
-
-
-// include new cpps
-#include "ace/Cleanup.cpp"
-#include "ace/Object_Manager_Base.cpp"
-#include "ace/OS_main.cpp"
-#include "ace/OS_NS_arpa_inet.cpp"
-#include "ace/OS_NS_ctype.cpp"
-#include "ace/OS_NS_dirent.cpp"
-#include "ace/OS_NS_dlfcn.cpp"
-#include "ace/OS_NS_errno.cpp"
-#include "ace/OS_NS_fcntl.cpp"
-#include "ace/OS_NS_math.cpp"
-#include "ace/OS_NS_netdb.cpp"
-#include "ace/OS_NS_poll.cpp"
-#include "ace/OS_NS_pwd.cpp"
-#include "ace/OS_NS_regex.cpp"
-#include "ace/OS_NS_signal.cpp"
-#include "ace/OS_NS_stdio.cpp"
-#include "ace/OS_NS_stdlib.cpp"
-#include "ace/OS_NS_string.cpp"
-#include "ace/OS_NS_strings.cpp"
-#include "ace/OS_NS_stropts.cpp"
-#include "ace/OS_NS_sys_mman.cpp"
-#include "ace/OS_NS_sys_msg.cpp"
-#include "ace/OS_NS_sys_resource.cpp"
-#include "ace/OS_NS_sys_select.cpp"
-#include "ace/OS_NS_sys_shm.cpp"
-#include "ace/OS_NS_sys_socket.cpp"
-#include "ace/OS_NS_sys_stat.cpp"
-#include "ace/OS_NS_sys_time.cpp"
-#include "ace/OS_NS_sys_uio.cpp"
-#include "ace/OS_NS_sys_utsname.cpp"
-#include "ace/OS_NS_sys_wait.cpp"
-#include "ace/OS_NS_Thread.cpp"
-#include "ace/OS_NS_time.cpp"
-#include "ace/OS_NS_unistd.cpp"
-#include "ace/OS_NS_wchar.cpp"
diff --git a/ACE/ace/OS.h b/ACE/ace/OS.h
deleted file mode 100644
index 5331d3a0db4..00000000000
--- a/ACE/ace/OS.h
+++ /dev/null
@@ -1,319 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file  OS.h
- *
- *  $Id$
- *
- *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- *  @author Jesper S. M|ller<stophph@diku.dk>
- *  @author and a cast of thousands...
- */
-//=============================================================================
-
-#ifndef ACE_OS_H
-#define ACE_OS_H
-
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (DO_NOT_INCLUDE_OS_H)
-#include "ace/Cleanup.h"
-#include "ace/Object_Manager_Base.h"
-#include "ace/OS_main.h"
-#include "ace/OS_NS_arpa_inet.h"
-#include "ace/OS_NS_ctype.h"
-#include "ace/OS_NS_dirent.h"
-#include "ace/OS_NS_dlfcn.h"
-#include "ace/OS_NS_errno.h"
-#include "ace/OS_NS_fcntl.h"
-#include "ace/OS_NS_math.h"
-#include "ace/OS_NS_netdb.h"
-#include "ace/OS_NS_poll.h"
-#include "ace/OS_NS_pwd.h"
-#include "ace/OS_NS_regex.h"
-#include "ace/OS_NS_signal.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_stdlib.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_strings.h"
-#include "ace/OS_NS_stropts.h"
-#include "ace/OS_NS_sys_mman.h"
-#include "ace/OS_NS_sys_msg.h"
-#include "ace/OS_NS_sys_resource.h"
-#include "ace/OS_NS_sys_select.h"
-#include "ace/OS_NS_sys_shm.h"
-#include "ace/OS_NS_sys_socket.h"
-#include "ace/OS_NS_sys_stat.h"
-#include "ace/OS_NS_sys_time.h"
-#include "ace/OS_NS_sys_uio.h"
-#include "ace/OS_NS_sys_utsname.h"
-#include "ace/OS_NS_sys_wait.h"
-#include "ace/OS_NS_Thread.h"
-#include "ace/OS_NS_time.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/OS_NS_wchar.h"
-
-// Include the split up ACE_OS classes
-#include "ace/OS_Memory.h"
-#include "ace/OS_TLI.h"
-#include "ace/OS_Errno.h"
-
-#include "ace/os_include/os_dlfcn.h"
-#include "ace/os_include/sys/os_mman.h"
-#include "ace/os_include/os_netdb.h"
-#include "ace/os_include/sys/os_socket.h"
-#include "ace/os_include/net/os_if.h"
-#include "ace/os_include/sys/os_sem.h"
-
-#include "ace/Time_Value.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ACE_Timeout_Manager;
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-// Here are all ACE-specific default constants, needed throughout ACE
-// and its applications.  The values can be over written by user
-// specific values in config.h files.
-#include "ace/Default_Constants.h"
-
-// Here are all ACE-specific global declarations needed throughout
-// ACE.
-#include "ace/Global_Macros.h"
-
-// include the ACE min()/max() functions.
-# include "ace/Min_Max.h"
-
-///////////////////////////////////////////
-//                                       //
-// NOTE: Please do not add any #includes //
-//       before this point.  On VxWorks, //
-//       vxWorks.h must be #included     //
-//       first!                          //
-//                                       //
-///////////////////////////////////////////
-
-#include "ace/os_include/netinet/os_tcp.h"
-#include "ace/os_include/sys/os_stat.h"
-#include "ace/os_include/os_stropts.h"
-#include "ace/os_include/os_unistd.h"
-#include "ace/os_include/sys/os_wait.h"
-
-
-// This needs to go here *first* to avoid problems with AIX.
-# if defined (ACE_HAS_PTHREADS)
-#   include "ace/os_include/os_pthread.h"
-# endif /* ACE_HAS_PTHREADS */
-
-# if defined (ACE_HAS_PROC_FS)
-#   include /**/ <sys/procfs.h>
-# endif /* ACE_HAS_PROC_FS */
-
-# if defined (ACE_HAS_POSIX_SEM)
-#   include "ace/os_include/os_semaphore.h"
-# endif /* ACE_HAS_POSIX_SEM */
-
-#include "ace/os_include/sys/os_types.h"
-#include "ace/os_include/os_stddef.h"
-#if !defined (ACE_LACKS_UNISTD_H)
-#  include "ace/os_include/os_unistd.h"
-#endif /* ACE_LACKS_UNISTD_H */
-
-// Standard C Library includes
-# if !defined (ACE_HAS_WINCE)
-#   include "ace/os_include/os_assert.h"
-#   include "ace/os_include/os_stdio.h"
-
-#   if !defined (ACE_LACKS_NEW_H)
-#     if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-#       include /**/ <new>
-#     else
-#       include /**/ <new.h>
-#     endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-#   endif /* ! ACE_LACKS_NEW_H */
-
-#   if !defined (ACE_VXWORKS)
-#   define ACE_DONT_INCLUDE_ACE_SIGNAL_H
-#     include "ace/os_include/os_signal.h"
-#   undef ACE_DONT_INCLUDE_ACE_SIGNAL_H
-#   endif /* ! VXWORKS */
-
-#   include "ace/os_include/os_fcntl.h"
-# endif /* ACE_HAS_WINCE */
-
-# include "ace/os_include/os_limits.h"
-# include "ace/os_include/os_ctype.h"
-# include "ace/os_include/os_string.h"
-# include "ace/os_include/os_stdlib.h"
-# include "ace/os_include/os_float.h"
-
-# if defined (ACE_NEEDS_SCHED_H)
-#   include "ace/os_include/os_sched.h"
-# endif /* ACE_NEEDS_SCHED_H */
-
-#   include "ace/iosfwd.h"
-
-# if !defined (ACE_HAS_WINCE)
-#   include "ace/os_include/os_fcntl.h"
-# endif /* ACE_HAS_WINCE */
-
-# if defined ACE_HAS_BYTESEX_H
-#   include /**/ <bytesex.h>
-# endif /* ACE_HAS_BYTESEX_H */
-# include "ace/Basic_Types.h"
-
-# if defined (ACE_HAS_UTIME)
-#   include "ace/os_include/os_utime.h"
-# endif /* ACE_HAS_UTIME */
-
-# if defined (ACE_WIN32)
-
-#   if !defined (ACE_HAS_WINCE)
-#     include "ace/os_include/sys/os_timeb.h"
-#   endif /* ACE_HAS_WINCE */
-
-#   if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
-#     include "ace/os_include/netinet/os_in.h"  // <ws2tcpip.h>
-#   endif /* ACE_HAS_WINSOCK2 */
-
-#   if !defined (ACE_HAS_WINCE)
-#     include "ace/os_include/os_time.h"
-#     include "ace/os_include/sys/os_stat.h"  // <direct.h>
-#     include "ace/os_include/os_unistd.h"  // <process.h>
-#   endif /* ACE_HAS_WINCE */
-
-#     include "ace/os_include/os_fcntl.h"
-
-# else /* !defined (ACE_WIN32) */
-
-#   if defined (CYGWIN32)
-#     include "ace/os_include/sys/os_uio.h"
-#     include "ace/os_include/os_fcntl.h"  // <sys/file.h>
-#     include "ace/os_include/sys/os_time.h"
-#     include "ace/os_include/sys/os_resource.h"
-#     include "ace/os_include/sys/os_wait.h"
-#     include "ace/os_include/os_pwd.h"
-#   elif defined (__QNX__)
-#     include "ace/os_include/sys/os_uio.h"
-#     include "ace/os_include/sys/os_ipc.h"
-#     include "ace/os_include/sys/os_time.h"
-#     include "ace/os_include/sys/os_wait.h"
-#     include "ace/os_include/sys/os_resource.h"
-#     include "ace/os_include/os_pwd.h"
-      // sets O_NDELAY
-#     include /**/ <unix.h>
-#     include "ace/os_include/os_limits.h"  // <sys/param.h> /* for NBBY */
-#   elif defined(ACE_HAS_RTEMS)
-#     include "ace/os_include/os_fcntl.h"  // <sys/file.h>
-#     include "ace/os_include/sys/os_resource.h"
-#     include "ace/os_include/sys/os_time.h"
-#     include "ace/os_include/sys/os_utsname.h"
-#     include "ace/os_include/sys/os_wait.h"
-#     include "ace/os_include/os_pwd.h"
-
-#   elif ! defined (ACE_VXWORKS) && ! defined (INTEGRITY)
-#     include "ace/os_include/sys/os_uio.h"
-#     include "ace/os_include/sys/os_ipc.h"
-#     if !defined(ACE_LACKS_SYSV_SHMEM)
-// No reason to #include this if the platform lacks support for SHMEM
-#       include "ace/os_include/sys/os_shm.h"
-#     endif /* ACE_LACKS_SYSV_SHMEM */
-#     include "ace/os_include/os_fcntl.h"  // <sys/file.h>
-#     include "ace/os_include/sys/os_time.h"
-#     include "ace/os_include/sys/os_resource.h"
-#     include "ace/os_include/sys/os_wait.h"
-#     include "ace/os_include/os_pwd.h"
-#   endif /* ! VXWORKS */
-#   include "ace/os_include/os_stropts.h" // <sys/ioctl.h>
-
-// IRIX5 defines bzero() in this odd file...
-#   if defined (ACE_HAS_BSTRING)
-#     include /**/ <bstring.h>
-#   endif /* ACE_HAS_BSTRING */
-
-// AIX defines bzero() in this odd file...
-#   if defined (ACE_HAS_STRINGS)
-#     include "ace/os_include/os_strings.h"
-#   endif /* ACE_HAS_STRINGS */
-
-#   if defined (ACE_HAS_TERMIOS)
-#     include "ace/os_include/os_termios.h"
-#   endif /* ACE_HAS_TERMIOS */
-
-#   if defined (ACE_HAS_AIO_CALLS)
-#     include "ace/os_include/os_aio.h"
-#   endif /* ACE_HAS_AIO_CALLS */
-
-#     include "ace/os_include/os_limits.h"  // <sys/param.h>
-
-#   if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-#     include "ace/os_include/sys/os_un.h"
-#   endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
-#   if defined (ACE_HAS_POLL)
-#     include "ace/os_include/os_poll.h"
-#   endif /* ACE_HAS_POLL */
-
-#   if defined (ACE_HAS_SELECT_H)
-#     include "ace/os_include/sys/os_select.h"
-#   endif /* ACE_HAS_SELECT_H */
-
-#     include "ace/os_include/sys/os_msg.h"
-
-#   if defined (ACE_HAS_PRIOCNTL)
-#     include /**/ <sys/priocntl.h>
-#   endif /* ACE_HAS_PRIOCNTL */
-
-# endif /* !defined (ACE_WIN32) */
-
-# if !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SYSLOG)
-# include "ace/os_include/os_syslog.h"
-# endif /* !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SYSLOG) */
-
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @namespace ACE_OS
- *
- * @brief This namespace defines an OS independent programming API that
- *     shields developers from nonportable aspects of writing
- *     efficient system programs on Win32, POSIX and other versions
- *     of UNIX, and various real-time operating systems.
- *
- * This namespace encapsulates the differences between various OS
- * platforms.  When porting ACE to a new platform, this class is
- * the place to focus on.  Once this file is ported to a new
- * platform, pretty much everything else comes for "free."  See
- * <www.cs.wustl.edu/~schmidt/ACE_wrappers/etc/ACE-porting.html>
- * for instructions on porting ACE.  Please see the README file
- * in this directory for complete information on the meaning of
- * the various macros.
- */
-namespace ACE_OS
-{
-  // = A set of wrappers for miscellaneous operations.
-}  /* namespace ACE_OS */
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-# if defined (ACE_HAS_INLINED_OSCALLS)
-#   if defined (ACE_INLINE)
-#     undef ACE_INLINE
-#   endif /* ACE_INLINE */
-#   define ACE_INLINE inline
-#   include "ace/OS.inl"
-# endif /* ACE_HAS_INLINED_OSCALLS */
-
-#endif /* 0 */
-
-#include /**/ "ace/post.h"
-#endif  /* ACE_OS_H */
diff --git a/ACE/ace/OS.inl b/ACE/ace/OS.inl
deleted file mode 100644
index 9948a7ca47b..00000000000
--- a/ACE/ace/OS.inl
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#if !defined (ACE_HAS_INLINED_OSCALLS)
-# undef ACE_INLINE
-# define ACE_INLINE
-#endif /* ACE_HAS_INLINED_OSCALLS */
-
-#if defined (ACE_HAS_XLI)
-# include /**/ <xliuser.h>
-#endif /* ACE_HAS_XLI */
-
-#if !defined (ACE_HAS_CPLUSPLUS_HEADERS)
-# include /**/ <libc.h>
-# include /**/ <osfcn.h>
-#endif /* ACE_HAS_CPLUSPLUS_HEADERS */
-
-#if defined (ACE_HAS_SYSENT_H)
-# include /**/ <sysent.h>
-#endif /* ACE_HAS_SYSENT_H */
-
-#if defined (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB) && \
-            (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB != 0)
-using std::bsearch;
-using std::qsort;
-# if defined (ACE_WIN32)
-using std::_tzset;
-# else
-using std::tzset;
-# endif
-using std::ctime;
-using std::localtime;
-using std::gmtime;
-using std::asctime;
-using std::strftime;
-#endif /* ACE_USES_STD_NAMESPACE_FOR_STDC_LIB */
-
-#if !defined (ACE_LACKS_MALLOC_H)
-# include /**/ <malloc.h>
-#endif /* ACE_LACKS_MALLOC_H */
-
-#if !defined (ACE_WIN32)
-
-// The following are #defines and #includes that must be visible for
-// ACE to compile it's OS wrapper class implementation correctly.  We
-// put them inside of here to reduce compiler overhead if we're not
-// inlining...
-
-# if defined (ACE_HAS_REGEX)
-#   include /**/ <regexpr.h>
-# endif /* ACE_HAS_REGEX */
-
-# if defined (ACE_HAS_SYS_SYSTEMINFO_H)
-#   include /**/ <sys/systeminfo.h>
-# endif /* ACE_HAS_SYS_SYSTEMINFO_H */
-
-# if defined (ACE_HAS_SYS_SYSCALL_H)
-#   include /**/ <sys/syscall.h>
-# endif /* ACE_HAS_SYS_SYSCALL_H */
-
-# if defined (ACE_HAS_GETIFADDRS)
-#   if defined (ACE_VXWORKS)
-#     include /**/ <net/ifaddrs.h>
-#   else
-#     include /**/ <ifaddrs.h>
-#   endif
-# endif /* ACE_HAS_GETIFADDRS */
-
-
-#endif /* WIN32 */
-
-#if defined (ACE_HAS_SHM_OPEN) && defined(INTEGRITY)
-#include "ace/os_include/sys/os_mman.h"
-#endif
-
-// ****************************************************************
diff --git a/ACE/ace/Thread_Control.inl b/ACE/ace/Thread_Control.inl
index f9c0f5a0e69..e5befff816a 100644
--- a/ACE/ace/Thread_Control.inl
+++ b/ACE/ace/Thread_Control.inl
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 #include "ace/OS_NS_macros.h"
diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc
index 8f39934e9e4..3b09bb12749 100644
--- a/ACE/ace/ace.mpc
+++ b/ACE/ace/ace.mpc
@@ -381,7 +381,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
     Reverse_Lock_T.inl
     TSS_T.inl
     ace_wchar.inl
-    OS.inl
   }
 
   Header_Files {
@@ -418,7 +417,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
     Null_Mutex.h
     Null_Semaphore.h
     Numeric_Limits.h
-    OS.h
     OS_Dirent.h
     OS_Memory.h
     OS_NS_macros.h
diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc
index 6b14a7a1813..b7b7f540ac1 100644
--- a/ACE/ace/ace_for_tao.mpc
+++ b/ACE/ace/ace_for_tao.mpc
@@ -286,7 +286,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     Guard_T.inl
     Handle_Gobbler.inl
     Lock_Adapter_T.inl
-    OS.inl
     OS_Memory.inl
     OS_String.inl
     Refcounted_Auto_Ptr.inl
@@ -322,7 +321,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     Null_Mutex.h
     Null_Semaphore.h
     Numeric_Limits.h
-    OS.h
     OS_Dirent.h
     OS_Memory.h
     OS_NS_macros.h
diff --git a/ACE/apps/JAWS3/bench/average.cpp b/ACE/apps/JAWS3/bench/average.cpp
index 568f183dbb3..d6336cc5e9e 100644
--- a/ACE/apps/JAWS3/bench/average.cpp
+++ b/ACE/apps/JAWS3/bench/average.cpp
@@ -1,5 +1,4 @@
 // $Id$
-#include "ace/OS.h"
 
 int
 ACE_TMAIN(int, ACE_TCHAR *[])
diff --git a/ACE/apps/JAWS3/bench/mkfiles.cpp b/ACE/apps/JAWS3/bench/mkfiles.cpp
index 03d932ec9ef..ce7513e343e 100644
--- a/ACE/apps/JAWS3/bench/mkfiles.cpp
+++ b/ACE/apps/JAWS3/bench/mkfiles.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 //FUZZ: disable check_for_math_include/
 #include <math.h>
diff --git a/ACE/apps/JAWS3/bench/rqfiles.cpp b/ACE/apps/JAWS3/bench/rqfiles.cpp
index 02cb88110ed..01948c864e7 100644
--- a/ACE/apps/JAWS3/bench/rqfiles.cpp
+++ b/ACE/apps/JAWS3/bench/rqfiles.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 #include "ace/Svc_Handler.h"
 #include "ace/Reactor.h"
diff --git a/ACE/apps/JAWS3/http/HTTP_Data.h b/ACE/apps/JAWS3/http/HTTP_Data.h
index 44a217addcb..2853dd9ca65 100644
--- a/ACE/apps/JAWS3/http/HTTP_Data.h
+++ b/ACE/apps/JAWS3/http/HTTP_Data.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_HTTP_DATA_H
 #define JAWS_HTTP_DATA_H
 
-#include "ace/OS.h"
 #include "ace/FILE_IO.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Message_Block.h"
diff --git a/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp b/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp
index f35897def98..b157388bf13 100644
--- a/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp
+++ b/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp
@@ -2,7 +2,6 @@
 
 #define ACE_BUILD_SVC_DLL
 
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 
 #include "jaws3/Concurrency.h"
diff --git a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
index 1908a0d95de..6444c727941 100644
--- a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
+++ b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_HTTP_SERVICE_HANDLER_H
 #define JAWS_HTTP_SERVICE_HANDLER_H
 
-#include "ace/OS.h"
 #include "ace/Synch.h"
 #include "ace/Acceptor.h"
 #include "ace/Svc_Handler.h"
diff --git a/ACE/apps/JAWS3/http/HTTP_States.h b/ACE/apps/JAWS3/http/HTTP_States.h
index cabfcf8cb62..465f9c9bba0 100644
--- a/ACE/apps/JAWS3/http/HTTP_States.h
+++ b/ACE/apps/JAWS3/http/HTTP_States.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_HTTP_STATES_H
 #define JAWS_HTTP_STATES_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 
 #include "jaws3/Protocol_Handler.h"
diff --git a/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket.h b/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket.h
index 232957892c1..bc40c6844ca 100644
--- a/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket.h
+++ b/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_REACTIVE_SOCKET_H
 #define JAWS_REACTIVE_SOCKET_H
 
-#include "ace/OS.h"
 #include "ace/Addr.h"
 #include "ace/Synch.h"
 #include "ace/Acceptor.h"
diff --git a/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.cpp b/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.cpp
index 258c27a0698..5379f169134 100644
--- a/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.cpp
+++ b/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.cpp
@@ -1,7 +1,6 @@
 /* -*- c++ -*- */
 // $Id$
 
-#include "ace/OS.h"
 #include "ace/Addr.h"
 #include "ace/Synch.h"
 #include "ace/Acceptor.h"
diff --git a/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.h b/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.h
index 63b860cb62a..93d6b47de5c 100644
--- a/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.h
+++ b/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_REACTIVE_SOCKET_HELPERS
 #define JAWS_REACTIVE_SOCKET_HELPERS
 
-#include "ace/OS.h"
 #include "ace/Addr.h"
 #include "ace/Synch.h"
 #include "ace/Acceptor.h"
diff --git a/ACE/apps/JAWS3/jaws3-todo/Socket.h b/ACE/apps/JAWS3/jaws3-todo/Socket.h
index 226082a4485..841517730bf 100644
--- a/ACE/apps/JAWS3/jaws3-todo/Socket.h
+++ b/ACE/apps/JAWS3/jaws3-todo/Socket.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_SOCKET_H
 #define JAWS_SOCKET_H
 
-#include "ace/OS.h"
 #include "ace/Addr.h"
 #include "ace/Synch.h"
 #include "ace/Singleton.h"
diff --git a/ACE/apps/JAWS3/jaws3/Concurrency_T.h b/ACE/apps/JAWS3/jaws3/Concurrency_T.h
index 704da56faea..fe7fb25955c 100644
--- a/ACE/apps/JAWS3/jaws3/Concurrency_T.h
+++ b/ACE/apps/JAWS3/jaws3/Concurrency_T.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_CONCURRENCY_T_H
 #define JAWS_CONCURRENCY_T_H
 
-// This gets me the ACE template defines without having to #include "ace/OS.h".
 #include "ace/config-lite.h"
 
 class JAWS_Protocol_Handler;
diff --git a/ACE/apps/JAWS3/small/SS_Data.h b/ACE/apps/JAWS3/small/SS_Data.h
index 2c20e464e48..73fe97c38b4 100644
--- a/ACE/apps/JAWS3/small/SS_Data.h
+++ b/ACE/apps/JAWS3/small/SS_Data.h
@@ -4,7 +4,6 @@
 #ifndef TERA_SS_DATA_H
 #define TERA_SS_DATA_H
 
-#include "ace/OS.h"
 #include "ace/FILE_IO.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Message_Block.h"
diff --git a/ACE/apps/JAWS3/small/SS_Service_Handler.cpp b/ACE/apps/JAWS3/small/SS_Service_Handler.cpp
index d255e627023..94c717b60b4 100644
--- a/ACE/apps/JAWS3/small/SS_Service_Handler.cpp
+++ b/ACE/apps/JAWS3/small/SS_Service_Handler.cpp
@@ -2,7 +2,6 @@
 
 #define ACE_BUILD_SVC_DLL
 
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 
 #include "jaws3/Concurrency.h"
diff --git a/ACE/apps/JAWS3/small/SS_Service_Handler.h b/ACE/apps/JAWS3/small/SS_Service_Handler.h
index 5d271ab9407..7287e659d6e 100644
--- a/ACE/apps/JAWS3/small/SS_Service_Handler.h
+++ b/ACE/apps/JAWS3/small/SS_Service_Handler.h
@@ -4,7 +4,6 @@
 #ifndef TERA_SS_SERVICE_HANDLER_H
 #define TERA_SS_SERVICE_HANDLER_H
 
-#include "ace/OS.h"
 #include "ace/Synch.h"
 #include "ace/Acceptor.h"
 #include "ace/Svc_Handler.h"
diff --git a/ACE/apps/JAWS3/small/SS_State_DONE.cpp b/ACE/apps/JAWS3/small/SS_State_DONE.cpp
index 67e09c80d90..3119fae00de 100644
--- a/ACE/apps/JAWS3/small/SS_State_DONE.cpp
+++ b/ACE/apps/JAWS3/small/SS_State_DONE.cpp
@@ -1,7 +1,5 @@
 // $Id$
 
-#include "ace/OS.h"
-
 #include "SS_State_DONE.h"
 #include "SS_Data.h"
 
diff --git a/ACE/apps/JAWS3/small/SS_State_DONE.h b/ACE/apps/JAWS3/small/SS_State_DONE.h
index fb995006d3f..2d41d18f9a1 100644
--- a/ACE/apps/JAWS3/small/SS_State_DONE.h
+++ b/ACE/apps/JAWS3/small/SS_State_DONE.h
@@ -4,7 +4,6 @@
 #ifndef TERA_SS_STATE_DONE_H
 #define TERA_SS_STATE_DONE_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 #include "ace/Synch_Traits.h"
 
diff --git a/ACE/apps/JAWS3/small/SS_State_ERROR.cpp b/ACE/apps/JAWS3/small/SS_State_ERROR.cpp
index 432b3c6673b..2f9dedda85e 100644
--- a/ACE/apps/JAWS3/small/SS_State_ERROR.cpp
+++ b/ACE/apps/JAWS3/small/SS_State_ERROR.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-#include "ace/OS.h"
 #include "jaws3/IO.h"
 
 #include "SS_State_ERROR.h"
diff --git a/ACE/apps/JAWS3/small/SS_State_ERROR.h b/ACE/apps/JAWS3/small/SS_State_ERROR.h
index c1f17dd3536..d0acb3091a0 100644
--- a/ACE/apps/JAWS3/small/SS_State_ERROR.h
+++ b/ACE/apps/JAWS3/small/SS_State_ERROR.h
@@ -4,7 +4,6 @@
 #ifndef TERA_SS_STATE_ERROR_H
 #define TERA_SS_STATE_ERROR_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 
 #include "jaws3/Protocol_Handler.h"
diff --git a/ACE/apps/JAWS3/small/SS_State_PARSE.cpp b/ACE/apps/JAWS3/small/SS_State_PARSE.cpp
index 1a78e58e4a7..3914f820be9 100644
--- a/ACE/apps/JAWS3/small/SS_State_PARSE.cpp
+++ b/ACE/apps/JAWS3/small/SS_State_PARSE.cpp
@@ -1,7 +1,5 @@
 // $Id$
 
-#include "ace/OS.h"
-
 #include "SS_State_READ.h"
 #include "SS_State_PARSE.h"
 #include "SS_State_WRITE.h"
diff --git a/ACE/apps/JAWS3/small/SS_State_PARSE.h b/ACE/apps/JAWS3/small/SS_State_PARSE.h
index 4ced246bf55..c083d40eebf 100644
--- a/ACE/apps/JAWS3/small/SS_State_PARSE.h
+++ b/ACE/apps/JAWS3/small/SS_State_PARSE.h
@@ -4,7 +4,6 @@
 #ifndef TERA_SS_STATE_PARSE_H
 #define TERA_SS_STATE_PARSE_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 
 #include "jaws3/Protocol_Handler.h"
diff --git a/ACE/apps/JAWS3/small/SS_State_READ.cpp b/ACE/apps/JAWS3/small/SS_State_READ.cpp
index fe94c66831a..d49f04fdf68 100644
--- a/ACE/apps/JAWS3/small/SS_State_READ.cpp
+++ b/ACE/apps/JAWS3/small/SS_State_READ.cpp
@@ -1,7 +1,5 @@
 // $Id$
 
-#include "ace/OS.h"
-
 #include "jaws3/IO.h"
 #include "jaws3/Event_Completer.h"
 
diff --git a/ACE/apps/JAWS3/small/SS_State_READ.h b/ACE/apps/JAWS3/small/SS_State_READ.h
index f01ca55dc57..69320c26270 100644
--- a/ACE/apps/JAWS3/small/SS_State_READ.h
+++ b/ACE/apps/JAWS3/small/SS_State_READ.h
@@ -4,7 +4,6 @@
 #ifndef TERA_SS_STATE_READ_H
 #define TERA_SS_STATE_READ_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 #include "ace/Synch_Traits.h"
 #include "jaws3/Protocol_Handler.h"
diff --git a/ACE/apps/JAWS3/small/SS_State_WRITE.cpp b/ACE/apps/JAWS3/small/SS_State_WRITE.cpp
index 2acb1f1b047..d539bafcf6a 100644
--- a/ACE/apps/JAWS3/small/SS_State_WRITE.cpp
+++ b/ACE/apps/JAWS3/small/SS_State_WRITE.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-#include "ace/OS.h"
 #include "ace/FILE_Connector.h"
 #include "ace/FILE_Addr.h"
 #include "ace/FILE_IO.h"
@@ -35,7 +34,7 @@ TeraSS_State_WRITE::service (JAWS_Event_Completer *ec, void *data)
       return 0;
     }
 
-  
+
   JAWS_IO::instance ()->transmit ( tdata->peer ().get_handle ()
                                  , tdata->file_io ().get_handle ()
                                  , ec
diff --git a/ACE/apps/JAWS3/small/SS_State_WRITE.h b/ACE/apps/JAWS3/small/SS_State_WRITE.h
index c5a51389ae5..06acfb75b22 100644
--- a/ACE/apps/JAWS3/small/SS_State_WRITE.h
+++ b/ACE/apps/JAWS3/small/SS_State_WRITE.h
@@ -4,7 +4,6 @@
 #ifndef TERA_SS_STATE_WRITE_H
 #define TERA_SS_STATE_WRITE_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 
 #include "jaws3/Protocol_Handler.h"
diff --git a/ACE/apps/JAWS3/small/SS_Templates.cpp b/ACE/apps/JAWS3/small/SS_Templates.cpp
index df34eb4eabd..23b436a7d44 100644
--- a/ACE/apps/JAWS3/small/SS_Templates.cpp
+++ b/ACE/apps/JAWS3/small/SS_Templates.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-#include "ace/OS.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Singleton.h"
 
diff --git a/ACE/bin/generate_doxygen.pl b/ACE/bin/generate_doxygen.pl
index 538aa738cea..a0822a7dae7 100755
--- a/ACE/bin/generate_doxygen.pl
+++ b/ACE/bin/generate_doxygen.pl
@@ -22,14 +22,14 @@ if (!defined $CIAO_ROOT) {
     $CIAO_ROOT = "$TAO_ROOT/CIAO";
 }
 if (!defined $DANCE_ROOT) {
-    $DANCE_ROOT = "$CIAO_ROOT/DAnCE";
+    $DANCE_ROOT = "$TAO_ROOT/DAnCE";
 }
 
 $is_release = 0;
 $exclude_ace = 0;
 $exclude_tao = !-r "$TAO_ROOT/VERSION";
 $exclude_ciao = !-r "$CIAO_ROOT/VERSION";
-$exclude_dance = !-r "$CIAO_ROOT/VERSION";
+$exclude_dance = !-r "$DANCE_ROOT/VERSION";
 $verbose = 0;
 $perl_path = '/usr/bin/perl';
 $html_output_dir = '.';
@@ -101,7 +101,7 @@ if (!-r "$ACE_ROOT/ace/config.h") {
 &generate_doxy_files ('ACE',  " $ACE_ROOT", " $ACE_ROOT/VERSION", @ACE_DOCS) if (!$exclude_ace);
 &generate_doxy_files ('TAO',  " $TAO_ROOT", " $TAO_ROOT/VERSION", @TAO_DOCS) if (!$exclude_tao);
 &generate_doxy_files ('CIAO', " $CIAO_ROOT", " $CIAO_ROOT/VERSION", @CIAO_DOCS) if (!$exclude_ciao);
-&generate_doxy_files ('DANCE'," $DANCE_ROOT", " $CIAO_ROOT/VERSION", @DANCE_DOCS) if (!$exclude_dance);
+&generate_doxy_files ('DANCE'," $DANCE_ROOT", " $DANCE_ROOT/VERSION", @DANCE_DOCS) if (!$exclude_dance);
 &generate_doxy_files ('DDS',   "$DDS_ROOT", " $DDS_ROOT/VERSION", @DDS_DOCS) if $dds;
 
 unlink "$ACE_ROOT/ace/config.h" if $wrote_configh;
diff --git a/ACE/contrib/FaCE/FaCE.h b/ACE/contrib/FaCE/FaCE.h
index ef1842323c0..89c1a7665bb 100644
--- a/ACE/contrib/FaCE/FaCE.h
+++ b/ACE/contrib/FaCE/FaCE.h
@@ -37,7 +37,6 @@ int main_i(int, wchar_t**);
 
 #else
 
-#include <ace/OS.h>
 #include <ace/CE_Screen_Output.h>
 
 int ace_main_i(int, ACE_TCHAR**);
diff --git a/ACE/debian/debian.rules b/ACE/debian/debian.rules
index 05071ec37e7..0a80ab05b64 100644
--- a/ACE/debian/debian.rules
+++ b/ACE/debian/debian.rules
@@ -160,7 +160,7 @@ install: build
 #	-chmod -x `find $(TAO_ROOT)/examples/ -perm 755 ! -type d -a ! \( -name "*.pl" -o -name "*.sh" \)`
 
 	rm -f $(DT)/usr/bin/TAO_Service
-	dh_install --sourcedir=$(DT) --fail-missing
+	dh_install --sourcedir=$(DT)
 
 binary-indep: build install doxygen-stamp
 	dh_testdir -i
diff --git a/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.h b/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.h
index c11f9a56d35..afa0e130654 100644
--- a/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.h
+++ b/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.h
@@ -9,7 +9,6 @@
 #define __HASTATUS_H_
 
 // Listing 1 code/ch19
-#include "ace/OS.h"
 #include "ace/Acceptor.h"
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Stream.h"
diff --git a/ACE/examples/APG/Svc_Config/HA_Status_Static.h b/ACE/examples/APG/Svc_Config/HA_Status_Static.h
index d4926ff0460..ccf961b8d92 100644
--- a/ACE/examples/APG/Svc_Config/HA_Status_Static.h
+++ b/ACE/examples/APG/Svc_Config/HA_Status_Static.h
@@ -9,7 +9,6 @@
 #define __HASTATUS_H_
 
 // Listing 1 code/ch19
-#include "ace/OS.h"
 #include "ace/Acceptor.h"
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Stream.h"
diff --git a/ACE/examples/Reactor/TP_Reactor/client.cpp b/ACE/examples/Reactor/TP_Reactor/client.cpp
index 5b516266696..5b0ac4886d5 100644
--- a/ACE/examples/Reactor/TP_Reactor/client.cpp
+++ b/ACE/examples/Reactor/TP_Reactor/client.cpp
@@ -8,7 +8,6 @@
 #include <ace/Auto_Ptr.h>
 #include <ace/INET_Addr.h>
 #include <ace/Log_Msg.h>
-#include <ace/OS.h>
 #include <ace/SOCK_Acceptor.h>
 #include <ace/SOCK_Connector.h>
 #include <ace/SOCK_Stream.h>
diff --git a/ACE/examples/Reactor/TP_Reactor/server.cpp b/ACE/examples/Reactor/TP_Reactor/server.cpp
index d80b1a32a14..6335a53da77 100644
--- a/ACE/examples/Reactor/TP_Reactor/server.cpp
+++ b/ACE/examples/Reactor/TP_Reactor/server.cpp
@@ -7,7 +7,6 @@
 
 #include <ace/Event_Handler.h>
 #include <ace/Log_Msg.h>
-#include <ace/OS.h>
 #include <ace/Reactor.h>
 #include <ace/Signal.h>
 #include <ace/streams.h>
diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
index 34a8bb2f0c9..43248a58034 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
@@ -20,7 +20,8 @@
 
 #include "ace/Message_Block.h"
 #include "ace/Reactor.h"
-
+#include "ace/os_include/netinet/os_tcp.h"
+#include "ace/OS_NS_time.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -64,7 +65,7 @@ ACE::HTBP::Channel::Channel (ACE_SOCK_Stream &s)
   if (result == -1)
     ACE_DEBUG ((LM_DEBUG, "HTBP::Channel ctor(stream), %p\n", "set_option" ));
 #endif /* ! ACE_LACKS_TCP_NODELAY */
-  
+
   this->filter_ = ACE::HTBP::Filter_Factory::get_filter (this->session_ != 0);
   this->request_count_ = static_cast<unsigned long> (ACE_OS::time());
 }
@@ -89,7 +90,7 @@ ACE::HTBP::Channel::Channel (ACE_HANDLE h)
   if (result == -1)
     ACE_DEBUG ((LM_DEBUG, "HTBP::Channel(handle) ctor, %p\n", "set_option" ));
 #endif /* ! ACE_LACKS_TCP_NODELAY */
-  
+
   this->filter_ = ACE::HTBP::Filter_Factory::get_filter (this->session_ != 0);
   this->request_count_ = static_cast<unsigned long> (ACE_OS::time());
 }
@@ -524,7 +525,7 @@ ACE::HTBP::Channel::sendv (const iovec iov[],
 
   ssize_t result = 0;
   size_t n = 0;
-  
+
   for (int i = 0; i < iovcnt; n += iov[i++].iov_len)
     {
       // No action.
diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Filter.h
index ebc9ebb895f..be1266beca3 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Filter.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Filter.h
@@ -14,13 +14,12 @@
 #define ACE_HTBP_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
+#include "HTBP_Export.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "HTBP_Export.h"
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE
diff --git a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
index e5d16000e83..82d618a5979 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
@@ -2,9 +2,7 @@
 // $Id$
 
 #include "ace/Log_Msg.h"
-
-//#include <sstream>
-
+#include "ace/OS_NS_stdio.h"
 #include "HTBP_Session.h"
 #include "HTBP_Inside_Squid_Filter.h"
 
@@ -12,8 +10,6 @@
 #include "HTBP_Inside_Squid_Filter.inl"
 #endif
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ssize_t
diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.cpp b/ACE/protocols/ace/HTBP/HTBP_Session.cpp
index 50a5ea2c4dc..b54f69587e1 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Session.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Session.cpp
@@ -6,6 +6,7 @@
 #include "HTBP_Session.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/Event_Handler.h"
+#include "ace/os_include/netinet/os_tcp.h"
 #include "HTBP_Filter.h"
 #include "HTBP_ID_Requestor.h"
 
@@ -13,8 +14,6 @@
 #include "HTBP_Session.inl"
 #endif
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE::HTBP::Session::Session_Map ACE::HTBP::Session::session_map_;
diff --git a/ACE/protocols/ace/TMCast/Group.cpp b/ACE/protocols/ace/TMCast/Group.cpp
index 508049d39f0..e2d82b3dec5 100644
--- a/ACE/protocols/ace/TMCast/Group.cpp
+++ b/ACE/protocols/ace/TMCast/Group.cpp
@@ -6,12 +6,12 @@
 #include <typeinfo>
 
 // 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>
 #include <ace/Condition_T.h>
+#include <ace/OS_NS_sys_time.h>
 
 #include "Messaging.hpp"
 
diff --git a/ACE/protocols/examples/RMCast/Send_Msg/Sender.cpp b/ACE/protocols/examples/RMCast/Send_Msg/Sender.cpp
index 5a1ed1674d6..d5a688ba687 100644
--- a/ACE/protocols/examples/RMCast/Send_Msg/Sender.cpp
+++ b/ACE/protocols/examples/RMCast/Send_Msg/Sender.cpp
@@ -2,7 +2,6 @@
 // author    : Boris Kolpackov <boris@kolpackov.net>
 // cvs-id    : $Id$
 
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
 #include "ace/RMCast/Socket.h"
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp
index 11a80469739..9329952313f 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp
@@ -6,6 +6,7 @@
 
 #include "ace/Log_Msg.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_sys_socket.h"
 
 #include "ace/HTBP/HTBP_Session.h"
 #include "ace/HTBP/HTBP_Stream.h"
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
index af9f211c48c..8e6ade0f486 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
@@ -17,6 +17,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_sys_socket.h"
 
 unsigned port = 8088;
 const ACE_TCHAR *notifier_file = 0;
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
index 02b32956691..d2047b4f121 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
@@ -32,7 +32,6 @@
 
 // This first #undef protects against command-line definitions.
 #undef ACE_NDEBUG
-#include "ace/OS.h"
 #include "ace/streams.h"
 #include "ace/Singleton.h"
 #include "ace/Synch.h"
diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp b/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp
index 4eba0b912f5..048341f730a 100644
--- a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp
+++ b/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp
@@ -8,6 +8,7 @@
 
 #include "ace/Log_Msg.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_sys_socket.h"
 
 const ssize_t Send_Size = 4*1024;
 const size_t Loops = 10;
diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp b/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp
index 724a14b2da3..7244cb6a25c 100644
--- a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp
+++ b/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp
@@ -10,6 +10,7 @@
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_sys_socket.h"
 
 const size_t Send_Size = 4*1024;
 const size_t Loops = 10;
diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp b/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp
index 2ad433e70ea..05fa4338b76 100644
--- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp
+++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp
@@ -28,13 +28,13 @@
 #include "ace/HTBP/HTBP_ID_Requestor.h"
 #include "ace/HTBP/HTBP_Environment.h"
 
-#include "ace/OS.h"
 #include "ace/Thread.h"
 #include "ace/Thread_Manager.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_sys_socket.h"
 
 // Change to non-zero if test fails
 static int Test_Result = 0;
diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp b/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp
index aec607eb629..0a4249ecc78 100644
--- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp
+++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp
@@ -28,7 +28,6 @@
 #include "ace/HTBP/HTBP_ID_Requestor.h"
 #include "ace/HTBP/HTBP_Environment.h"
 
-#include "ace/OS.h"
 #include "ace/Thread.h"
 #include "ace/Thread_Manager.h"
 #include "ace/SOCK_Connector.h"
@@ -36,6 +35,7 @@
 #include "ace/SOCK_Stream.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_sys_socket.h"
 
 // Change to non-zero if test fails
 static int Test_Result = 0;
diff --git a/ACE/protocols/tests/HTBP/ping/client.cpp b/ACE/protocols/tests/HTBP/ping/client.cpp
index 481be629208..cba6fab8f73 100644
--- a/ACE/protocols/tests/HTBP/ping/client.cpp
+++ b/ACE/protocols/tests/HTBP/ping/client.cpp
@@ -7,6 +7,7 @@
 #include "ace/ACE.h"
 #include "ace/Log_Msg.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_sys_socket.h"
 
 #include "ace/HTBP/HTBP_Session.h"
 #include "ace/HTBP/HTBP_Stream.h"
diff --git a/ACE/protocols/tests/HTBP/ping/server.cpp b/ACE/protocols/tests/HTBP/ping/server.cpp
index 7bde988c3cf..d9f5caa05eb 100644
--- a/ACE/protocols/tests/HTBP/ping/server.cpp
+++ b/ACE/protocols/tests/HTBP/ping/server.cpp
@@ -14,6 +14,7 @@
 #include "ace/SOCK_Stream.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_sys_socket.h"
 
 unsigned port = 8088;
 const ACE_TCHAR *notifier_file = 0;
diff --git a/ACE/protocols/tests/RMCast/Sender.cpp b/ACE/protocols/tests/RMCast/Sender.cpp
index bbc6dc1b1f7..4de78df310c 100644
--- a/ACE/protocols/tests/RMCast/Sender.cpp
+++ b/ACE/protocols/tests/RMCast/Sender.cpp
@@ -2,7 +2,6 @@
 // author    : Boris Kolpackov <boris@kolpackov.net>
 // cvs-id    : $Id$
 
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
 #include "ace/RMCast/Socket.h"
diff --git a/ACE/tests/Based_Pointer_Test.cpp b/ACE/tests/Based_Pointer_Test.cpp
index 42ff2d77bec..3c54b936156 100644
--- a/ACE/tests/Based_Pointer_Test.cpp
+++ b/ACE/tests/Based_Pointer_Test.cpp
@@ -19,7 +19,6 @@
 #include "test_config.h"
 #include "ace/DLL.h"
 #include "ace/ACE.h"
-#include "ace/OS.h"
 #ifdef ACE_HAS_POSITION_INDEPENDENT_POINTERS
 #include "ace/Based_Pointer_Repository.h"
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS */
diff --git a/ACE/tests/Bug_2980_Regression_Dll.cpp b/ACE/tests/Bug_2980_Regression_Dll.cpp
index 280f9d87be5..84ac9a1b0e9 100644
--- a/ACE/tests/Bug_2980_Regression_Dll.cpp
+++ b/ACE/tests/Bug_2980_Regression_Dll.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
 #include "ace/Init_ACE.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 #include "test_config.h"
 
-
 extern "C"
 {
 
diff --git a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp
index d589267a48f..4d790cfa72c 100644
--- a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp
+++ b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp
@@ -32,7 +32,6 @@
 #include "ace/SSL/SSL_Asynch_Stream.h"
 #include "ace/Proactor.h"
 #include "ace/Task.h"
-#include "ace/OS.h"
 #include "ace/Asynch_Acceptor.h"
 #include "ace/Asynch_Connector.h"
 #include "ace/Manual_Event.h"
author	Johnny Willemsen <jwillemsen@remedy.nl>	2010-09-13 09:31:11 +0000
committer	Johnny Willemsen <jwillemsen@remedy.nl>	2010-09-13 09:31:11 +0000
commit	fb798abe4310e88b47dd9013eb398aeccf3cb9a4 (patch)
tree	5ba609a185367cc44a0fd441d960e0ec24b64a37
parent	45f0f0cf6fdfdd6065ae2301d45a2ec0036b6d11 (diff)
download	ATCD-fb798abe4310e88b47dd9013eb398aeccf3cb9a4.tar.gz