Merge pull request #2042 from jwillemsen/jwi-cleanupmacros

Cleanup unused macros

12 files changed, 14 insertions, 243 deletions

diff --git a/ACE/ace/IOStream.h b/ACE/ace/IOStream.h
index 38ebe090593..6acbb0687ad 100644
--- a/ACE/ace/IOStream.h
+++ b/ACE/ace/IOStream.h
@@ -373,19 +373,6 @@ typedef ostream& (*__omanip_)(ostream&);
 // These are necessary in case somebody wants to derive from us and
 // override one of these with a custom approach.
 
-#  if defined (ACE_LACKS_CHAR_RIGHT_SHIFTS)
-#define GET_FUNC_SET0(MT,CODE,CODE2) \
-        GET_PROT(MT,short &,CODE) \
-        GET_PROT(MT,u_short &,CODE) \
-        GET_PROT(MT,int &,CODE) \
-        GET_PROT(MT,u_int &,CODE) \
-        GET_PROT(MT,long &,CODE) \
-        GET_PROT(MT,u_long &,CODE) \
-        GET_PROT(MT,float &,CODE) \
-        GET_PROT(MT,double &,CODE) \
-        inline virtual MT& operator>>(__omanip_ func) CODE2 \
-        inline virtual MT& operator>>(__manip_ func)  CODE2
-#  else
 #define GET_FUNC_SET0(MT,CODE,CODE2) \
         GET_PROT(MT,short &,CODE) \
         GET_PROT(MT,u_short &,CODE) \
@@ -401,7 +388,6 @@ typedef ostream& (*__omanip_)(ostream&);
         GET_PROT(MT,u_char *,CODE) \
         inline virtual MT& operator>>(__omanip_ func) CODE2 \
         inline virtual MT& operator>>(__manip_ func)  CODE2
-#  endif
 
 #define PUT_FUNC_SET0(MT,CODE,CODE2) \
         PUT_PROT(MT,short,CODE) \
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index e3e9532c5b3..1dff5ccf076 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -2552,16 +2552,6 @@ ACE_OS::event_init (ACE_event_t *event,
   if (type == USYNC_PROCESS)
     {
       const char *name_p = name;
-#  if defined (ACE_SHM_OPEN_REQUIRES_ONE_SLASH)
-      char adj_name[MAXPATHLEN];
-      if (name[0] != '/')
-        {
-          adj_name[0] = '/';
-          ACE_OS::strsncpy (&adj_name[1], name, MAXPATHLEN-1);
-          name_p = adj_name;
-        }
-#  endif /* ACE_SHM_OPEN_REQUIRES_ONE_SLASH */
-
       bool owner = false;
       // Let's see if the shared memory entity already exists.
       ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name_p),
diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl
index 45520ab7e46..17335f782c5 100644
--- a/ACE/ace/OS_NS_Thread.inl
+++ b/ACE/ace/OS_NS_Thread.inl
@@ -2095,10 +2095,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
 
       if (expired)
         error = ETIME;
-
-#     if defined (ACE_LACKS_COND_TIMEDWAIT_RESET)
-      tv = tv.now ();
-#     endif /* ACE_LACKS_COND_TIMEDWAIT_RESET */
     }
 
   if (result != -2)
@@ -2173,9 +2169,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
 
   if (result == 0)
     {
-#     if defined (ACE_LACKS_COND_TIMEDWAIT_RESET)
-      tv = tv.now ();
-#     endif /* ACE_LACKS_COND_TIMEDWAIT_RESET */
       --s->count_;
     }
 
diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp
index d151b885fb9..145a34d3b43 100644
--- a/ACE/ace/OS_NS_unistd.cpp
+++ b/ACE/ace/OS_NS_unistd.cpp
@@ -11,7 +11,6 @@
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_Thread.h"
 #include "ace/Object_Manager_Base.h"
-#include "ace/os_include/sys/os_pstat.h"
 #if defined (ACE_HAS_SYSCTL)
 # include "ace/os_include/sys/os_sysctl.h"
 #endif /* ACE_HAS_SYSCTL */
diff --git a/ACE/ace/Profile_Timer.cpp b/ACE/ace/Profile_Timer.cpp
index 838e7860b8a..dbfe197d690 100644
--- a/ACE/ace/Profile_Timer.cpp
+++ b/ACE/ace/Profile_Timer.cpp
@@ -64,7 +64,6 @@ void
 ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage)
 {
   ACE_TRACE ("ACE_Profile_Timer::elapsed_rusage");
-#    if !defined (ACE_HAS_LIMITED_RUSAGE_T)
   // integral shared memory size
   usage.ru_ixrss =
     this->end_usage_.ru_ixrss - this->last_usage_.ru_ixrss;
@@ -110,9 +109,6 @@ ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage)
   this->subtract (usage.ru_stime,
                   this->end_usage_.ru_stime,
                   this->last_usage_.ru_stime);
-#    else
-  ACE_UNUSED_ARG(usage);
-#    endif /* ACE_HAS_LIMITED_RUSAGE_T */
 }
 
 void
diff --git a/ACE/ace/README b/ACE/ace/README
index 62d633530c5..eb25e0dda78 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -175,10 +175,6 @@ ACE_SCANDIR_CMP_USES_VOIDPTR            The OS's scandir() comparator function
 ACE_SCANDIR_CMP_USES_CONST_VOIDPTR      The OS's scandir() comparator function
                                         is int (*compare)(const void*,
                                                           const void*).
-ACE_HAS_STDARG_THR_DEST                 Platform has void (*)(...)
-                                        prototype for
-                                        pthread_key_create()
-                                        destructor (e.g., LynxOS).
 ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS     Platform/compiler supports
                                         Win32 structural exceptions
 ACE_HAS_4_4BSD_SENDMSG_RECVMSG          Platform has BSD 4.4
@@ -197,20 +193,6 @@ ACE_HAS_BIG_FD_SET                      Compiler/platform has typedef
 ACE_HAS_BROKEN_ACCEPT_ADDR              Platform can't correctly deal
                                         with a NULL addr to accept()
                                         (e.g, VxWorks < 6.9).
-ACE_HAS_BROKEN_DGRAM_SENDV              Platform sendv() does not work
-                                        properly with datagrams,
-                                        i.e. it fails when the iovec
-                                        size is IOV_MAX.
-ACE_HAS_BROKEN_MAP_FAILED               Platform doesn't cast MAP_FAILED
-                                        to a void *.
-ACE_HAS_BROKEN_MSG_H                    Platform headers don't support
-                                        <msg.h> prototypes
-ACE_HAS_BROKEN_MMAP_H                   HP/UX does not wrap the
-                                        mmap(2) header files with
-                                        extern "C".
-ACE_HAS_BROKEN_NESTED_TEMPLATES         MSVC has trouble with defining
-                                        STL containers for nested
-                                        structs and classes
 ACE_HAS_BYTESEX_H                       Platform has <bytesex.h>.
 ACE_HAS_CANCEL_IO                       Platform supports the Win32
                                         CancelIO() function (WinNT 4.0
@@ -286,8 +268,6 @@ ACE_HAS_NONSTATIC_OBJECT_MANAGER        Causes the ACE_Object_Manager
                                         a static (global) instance.
 ACE_HAS_THR_KEYDELETE                   Platform supports
                                         thr_keydelete (e.g,. UNIXWARE)
-ACE_HAS_LIMITED_RUSAGE_T                The rusage_t structure has
-                                        only two fields.
 ACE_HAS_LINUX_NPTL                      Linux platform (with kernel >= 2.6.x)
                                         with GLibc including new NPTL (Native
                                         POSIX Thread Library).
@@ -427,7 +407,7 @@ ACE_HAS_SIGINFO_T                       Platform supports SVR4
                                         extended signals
 ACE_HAS_SIGSUSPEND                      Platform supports sigsuspend()
 ACE_HAS_SIGISMEMBER_BUG                 Platform has bug with
-                                        sigismember() (HP/UX 11).
+                                        sigismember()
 ACE_HAS_SIGNAL_OBJECT_AND_WAIT          Platform supports the Win32
                                         SignalObjectAndWait() function
                                         (WinNT 4.0 and beyond).
@@ -465,39 +445,21 @@ ACE_HAS_STRNLEN                         Platform supports strnlen(3).
 ACE_HAS_STREAMS                         Platform supports STREAMS
 ACE_HAS_STREAM_PIPES                    Platform supports STREAM pipes
 ACE_HAS_STRICT                          Use the STRICT compilation mode on Win32.
-ACE_HAS_STRUCT_NETDB_DATA               Compiler/platform has strange
-                                        hostent API for socket *_r()
-                                        calls
 ACE_HAS_SVR4_DYNAMIC_LINKING            Compiler/platform supports
                                         SVR4 dynamic linking semantics
 ACE_HAS_SVR4_GETTIMEOFDAY               Compiler/platform supports
                                         SVR4 gettimeofday() prototype
 ACE_HAS_SVR4_SIGNAL_T                   Compiler/platform supports
                                         SVR4 signal typedef
-ACE_HAS_SYSCALL_GETRUSAGE               HP/UX has an undefined syscall
-                                        for GETRUSAGE...
-ACE_HAS_SYSENT_H                        Platform provides <sysent.h>
-                                        header
 ACE_HAS_SYSV_IPC                        Platform supports System V IPC
                                         (most versions of UNIX, but
                                         not Win32)
 ACE_HAS_SYS_FILIO_H                     Platform provides
                                         <sys/filio.h> header
-ACE_HAS_SYS_LOADAVG_H                   Compiler/platform contains the
-                                        <sys/loadavg.h> file.
-ACE_HAS_SYS_PSTAT_H                     Compiler/platform contains the
-                                        <sys/pstat.h> file.
 ACE_HAS_SYS_SOCKIO_H                    Compiler/platform provides the
                                         sockio.h file
 ACE_HAS_SYS_SYSCALL_H                   Compiler/platform contains the
                                         <sys/syscall.h> file.
-ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA   Compiler's template
-                                        instantiation mechanism
-                                        supports the use of "#pragma
-                                        instantiate".  Edison Design
-                                        Group compilers, e.g., SGI C++
-                                        and Green Hills 1.8.8 and
-                                        later, support this.
 ACE_HAS_TEMPLATE_TYPEDEFS               Compiler implements templates
                                         that support typedefs inside
                                         of classes used as formal
@@ -547,9 +509,6 @@ ACE_HAS_UALARM                          Platform supports ualarm()
 ACE_HAS_UCONTEXT_T                      Platform supports ucontext_t
                                         (which is used in the extended
                                         signal API).
-ACE_HAS_UNION_WAIT                      The wait() system call takes a
-                                        (union wait *) rather than int
-                                        *
 ACE_HAS_VALGRIND                        Running with valgrind
 ACE_HAS_VERBOSE_NOTSUP                  Prints out console message in
                                         ACE_NOTSUP.  Useful for
@@ -653,9 +612,6 @@ ACE_LACKS_OPENDIR                       Platform lacks opendir and the opendir
                                         emulation must be used
 ACE_LACKS_READDIR                       Platform lacks readdir and the readdir
                                         emulation must be used
-ACE_LACKS_COND_TIMEDWAIT_RESET          pthread_cond_timedwait does
-                                        *not* reset the time argument
-                                        when the lock is acquired.
 ACE_LACKS_CONST_TIMESPEC_PTR            Platform forgot const in
                                         cond_timewait (e.g., HP/UX).
 ACE_LACKS_COND_T                        Platform lacks condition
@@ -727,8 +683,6 @@ ACE_LACKS_NETDB_REENTRANT_FUNCTIONS     Platform does not support
                                         getservbyname_r).
 ACE_LACKS_NEW_H                         OS doesn't have, or we don't want to
                                         use, new.h.
-ACE_LACKS_NULL_PTHREAD_STATUS           OS requires non-null status pointer
-                                        for ::pthread_join ().
 ACE_LACKS_PERFECT_MULTICAST_FILTERING   Platform lacks IGMPv3 "perfect" filtering
                                         of multicast dgrams at the socket level.
                                         If == 1, ACE_SOCK_Dgram_Mcast will bind
@@ -747,8 +701,6 @@ ACE_LACKS_PTHREAD_THR_SIGSETMASK        Platform lacks
 ACE_LACKS_PUTENV_PROTOTYPE              Platform/compiler lacks the
                                         putenv() prototype (e.g.,
                                         LynxOS)
-ACE_LACKS_PWD_REENTRANT_FUNCTIONS       Platform lacks getpwnam_r()
-                                        methods (e.g., SGI 6.2).
 ACE_LACKS_QSORT                         Compiler/platform lacks the
                                         standard C library qsort()
                                         function
@@ -838,12 +790,6 @@ ACE_LACKS_TIMESPEC_T                    Platform does not define
                                         struct timespec.
 ACE_LACKS_TRUNCATE                      Platform doesn't have truncate()
                                         (e.g., vxworks)
-ACE_LACKS_CHAR_RIGHT_SHIFTS             Compiler does not have any istream
-                                        operator>> for chars, u_chars, or
-                                        signed chars.
-ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS        Compiler does not have
-                                        operator>> (istream &, u_char *) or
-                                        operator>> (istream &, signed char *)
 ACE_LACKS_UCONTEXT_H                    Platform lacks the ucontext.h
                                         file
 ACE_LACKS_UMASK                         Platform lacks umask function
@@ -855,9 +801,6 @@ ACE_LACKS_UNIX_DOMAIN_SOCKETS           ACE platform has no UNIX
                                         domain sockets
 ACE_LACKS_UNIX_SIGNALS                  Platform lacks full signal
                                         support (e.g., Win32).
-ACE_LACKS_UNSIGNEDLONGLONG_T            Compiler/platform does not
-                                        support the unsigned long
-                                        long datatype.
 ACE_LACKS_UTSNAME_T                     Platform lacks struct utsname
                                         (e.g., Win32 and VxWorks)
 ACE_LACKS_UNAME                         Platform lacks uname calls
@@ -879,10 +822,6 @@ ACE_NO_WIN32_LEAN_AND_MEAN              If this is set, then ACE does not
                                         code that uses non-lean Win32
                                         facilities such as COM.
 
-ACE_SHM_OPEN_REQUIRES_ONE_SLASH         The path specified on shm_open() must
-                                        have a leading, single slash and not
-                                        have any other slashes.
-
 ACE_WSTRING_HAS_USHORT_SUPPORT          If a platform has wchar_t as a
                                         separate type, then
                                         ACE_WString doesn't have a
@@ -1179,16 +1118,6 @@ ACE_HAS_POLL:
      #include /**/ <poll.h>
      #endif /* ACE_HAS_POLL */
 
-ACE_USE_POLL_IMPLEMENTATION:
-------------------
-
-  Used in:
-     ace/OS.h
-
-  Notes:
-    Use the poll() event demultiplexor rather than select().
-
-
 ACE_HAS_SVR4_SIGNAL_T:
 ----------------------
 
@@ -1283,19 +1212,6 @@ ACE_HAS_TIUSER_H:
      in conjunction with t_bind, t_accept, etc.. transport layer.
 
 
-ACE_USE_POLL_IMPLEMENTATION:
-----------------------------
-
-  Used in:
-     libsrc/Reactor/Reactor.i
-     include/Event_Handler.h
-     ace/OS.h
-     include/Reactor.h
-
-  Notes:
-     in the reactor, use poll instead of select.  In general,
-     good thing to have set.
-
 ACE_USES_GPROF:
 ----------------------------
   Used in:
diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h
deleted file mode 100644
index 75fafb245d4..00000000000
--- a/ACE/ace/config-suncc-common.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- C++ -*-
-#ifndef ACE_SUNCC_COMMON_H
-#define ACE_SUNCC_COMMON_H
-#include /**/ "ace/pre.h"
-
-# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS
-# define ACE_HAS_THR_C_DEST 1
-# define ACE_LACKS_SWAB
-#if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0
-#  undef ACE_HAS_CUSTOM_EXPORT_MACROS
-#else
-#  ifndef ACE_HAS_CUSTOM_EXPORT_MACROS
-#    define ACE_HAS_CUSTOM_EXPORT_MACROS
-#  endif  /* !ACE_HAS_CUSTOM_EXPORT_MACROS */
-#  define ACE_Proper_Export_Flag __attribute__ ((visibility("default")))
-#  define ACE_Proper_Import_Flag
-#  define ACE_EXPORT_SINGLETON_DECLARATION(T) template class ACE_Proper_Export_Flag T
-#  define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class ACE_Proper_Export_Flag SINGLETON_TYPE <CLASS, LOCK>;
-#  define ACE_IMPORT_SINGLETON_DECLARATION(T) __extension__ extern template class T
-#  define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE<CLASS, LOCK>;
-#endif  /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */
-
-#if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
-# define ACE_SIZEOF_LONG_DOUBLE 12
-#endif /* i386 */
-
-#if defined (i386) || defined (__i386__)
-  // If running an Intel, assume that it's a Pentium so that
-  // ACE_OS::gethrtime () can use the RDTSC instruction.  If running a
-  // 486 or lower, be sure to comment this out.  (If not running an
-  // Intel CPU, this #define will not be seen because of the i386
-  // protection, so it can be ignored.)
-# define ACE_HAS_PENTIUM
-#endif /* i386 */
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-  // We define it with a -D with make depend.
-# define ACE_LACKS_PRAGMA_ONCE
-#endif /* ! ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_SUNCC_COMMON_H */
diff --git a/ACE/ace/os_include/os_netdb.h b/ACE/ace/os_include/os_netdb.h
index de509b4cbc7..189f29b9dbb 100644
--- a/ACE/ace/os_include/os_netdb.h
+++ b/ACE/ace/os_include/os_netdb.h
@@ -127,24 +127,19 @@ struct  servent {
 # define EAI_OVERFLOW -12 /* Error result from getaddrinfo(): buffer overflow */
 #endif
 
-#if defined (ACE_HAS_STRUCT_NETDB_DATA)
-   typedef char ACE_HOSTENT_DATA[sizeof(struct hostent_data)];
-   typedef char ACE_SERVENT_DATA[sizeof(struct servent_data)];
-   typedef char ACE_PROTOENT_DATA[sizeof(struct protoent_data)];
-#else
-#  if !defined ACE_HOSTENT_DATA_SIZE
-#    define ACE_HOSTENT_DATA_SIZE (4*1024)
-#  endif /*ACE_HOSTENT_DATA_SIZE */
-#  if !defined ACE_SERVENT_DATA_SIZE
-#    define ACE_SERVENT_DATA_SIZE (4*1024)
-#  endif /*ACE_SERVENT_DATA_SIZE */
-#  if !defined ACE_PROTOENT_DATA_SIZE
-#    define ACE_PROTOENT_DATA_SIZE (2*1024)
-#  endif /*ACE_PROTOENT_DATA_SIZE */
-   typedef char ACE_HOSTENT_DATA[ACE_HOSTENT_DATA_SIZE];
-   typedef char ACE_SERVENT_DATA[ACE_SERVENT_DATA_SIZE];
-   typedef char ACE_PROTOENT_DATA[ACE_PROTOENT_DATA_SIZE];
-#endif /* ACE_HAS_STRUCT_NETDB_DATA */
+#if !defined ACE_HOSTENT_DATA_SIZE
+#  define ACE_HOSTENT_DATA_SIZE (4*1024)
+#endif /*ACE_HOSTENT_DATA_SIZE */
+#if !defined ACE_SERVENT_DATA_SIZE
+#  define ACE_SERVENT_DATA_SIZE (4*1024)
+#endif /*ACE_SERVENT_DATA_SIZE */
+#if !defined ACE_PROTOENT_DATA_SIZE
+#  define ACE_PROTOENT_DATA_SIZE (2*1024)
+#endif /*ACE_PROTOENT_DATA_SIZE */
+
+typedef char ACE_HOSTENT_DATA[ACE_HOSTENT_DATA_SIZE];
+typedef char ACE_SERVENT_DATA[ACE_SERVENT_DATA_SIZE];
+typedef char ACE_PROTOENT_DATA[ACE_PROTOENT_DATA_SIZE];
 
 # if !defined(MAXHOSTNAMELEN)
 #   define MAXHOSTNAMELEN  HOST_NAME_MAX
diff --git a/ACE/ace/os_include/sys/os_loadavg.h b/ACE/ace/os_include/sys/os_loadavg.h
deleted file mode 100644
index 6437d7d9235..00000000000
--- a/ACE/ace/os_include/sys/os_loadavg.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    os_loadavg.h
- *
- *  loadavg functions
- *
- *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef ACE_OS_INCLUDE_SYS_OS_LOADAVG_H
-#define ACE_OS_INCLUDE_SYS_OS_LOADAVG_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 (ACE_HAS_SYS_LOADAVG_H)
-# include /**/ <sys/loadavg.h>
-#endif /* ACE_HAS_SYS_LOADAVG_H */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_OS_INCLUDE_SYS_OS_LOADAVG_H */
diff --git a/ACE/ace/os_include/sys/os_pstat.h b/ACE/ace/os_include/sys/os_pstat.h
deleted file mode 100644
index 377e83b2e1c..00000000000
--- a/ACE/ace/os_include/sys/os_pstat.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    os_pstat.h
- *
- *  pstat functions
- *
- *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef ACE_OS_INCLUDE_SYS_OS_PSTAT_H
-#define ACE_OS_INCLUDE_SYS_OS_PSTAT_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 (ACE_HAS_SYS_PSTAT_H)
-#  include /**/ <sys/param.h>
-#  include /**/ <sys/pstat.h>
-#endif /* ACE_HAS_SYS_PSTAT_H */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_OS_INCLUDE_SYS_OS_PSTAT_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index 05a518b049c..f4f43bb2f16 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -4,8 +4,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_netdb.h"
-#include "ace/os_include/sys/os_pstat.h"
-#include "ace/os_include/sys/os_loadavg.h"
 #if defined(__NetBSD__) || defined (__APPLE__)
 #include <sys/sysctl.h>
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index d991ba35514..eb483d25b83 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -6,7 +6,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_netdb.h"
-#include "ace/os_include/sys/os_loadavg.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL