Merge pull request #1924 from mitza-oci/ace6-vxworks

[ACE 6] Merged recent VxWorks changes

61 files changed, 203 insertions, 133 deletions

diff --git a/ACE/ace/ARGV.h b/ACE/ace/ARGV.h
index a0edd1c78d5..00aa041d140 100644
--- a/ACE/ace/ARGV.h
+++ b/ACE/ace/ARGV.h
@@ -63,7 +63,7 @@ public:
 
   /// We need this destructor to keep some compilers from complaining.
   /// It's just a no-op, however.
-  ~ACE_ARGV_Queue_Entry_T (void);
+  ~ACE_ARGV_Queue_Entry_T ();
 
   /// Dump the state of this object.
   void dump (void) const;
diff --git a/ACE/ace/ARGV.inl b/ACE/ace/ARGV.inl
index cd538e9ec5c..71ffbd4ec2e 100644
--- a/ACE/ace/ARGV.inl
+++ b/ACE/ace/ARGV.inl
@@ -30,7 +30,7 @@ ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::ACE_ARGV_Queue_Entry_T (const ACE_ARGV_Queue_
 }
 
 template <typename CHAR_TYPE> ACE_INLINE
-ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::~ACE_ARGV_Queue_Entry_T (void)
+ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::~ACE_ARGV_Queue_Entry_T ()
 {
   // No-op just to keep some compilers happy...
 }
diff --git a/ACE/ace/ATM_Params.inl b/ACE/ace/ATM_Params.inl
index 59ec331b53e..6c129d44487 100644
--- a/ACE/ace/ATM_Params.inl
+++ b/ACE/ace/ATM_Params.inl
@@ -40,7 +40,7 @@ ACE_ATM_Params::ACE_ATM_Params (int rw_flag,
 
 // Default dtor.
 ACE_INLINE
-ACE_ATM_Params::~ACE_ATM_Params (void)
+ACE_ATM_Params::~ACE_ATM_Params ()
 {
   ACE_TRACE ("ACE_ATM_Params::~ACE_ATM_Params");
 }
diff --git a/ACE/ace/Active_Map_Manager_T.h b/ACE/ace/Active_Map_Manager_T.h
index 472ea71911b..fc9be984d5a 100644
--- a/ACE/ace/Active_Map_Manager_T.h
+++ b/ACE/ace/Active_Map_Manager_T.h
@@ -58,7 +58,7 @@ public:
 
   /// Close down a Active_Map_Manager and release dynamically
   /// allocated resources.
-  ~ACE_Active_Map_Manager (void);
+  ~ACE_Active_Map_Manager ();
 
   /// Initialize a Active_Map_Manager with size @a length.
   int open (size_t length = ACE_DEFAULT_MAP_SIZE,
diff --git a/ACE/ace/Active_Map_Manager_T.inl b/ACE/ace/Active_Map_Manager_T.inl
index c8a6caf9b52..4cbc7567eed 100644
--- a/ACE/ace/Active_Map_Manager_T.inl
+++ b/ACE/ace/Active_Map_Manager_T.inl
@@ -237,7 +237,7 @@ ACE_Active_Map_Manager<T>::ACE_Active_Map_Manager (size_t size,
 }
 
 template <class T> ACE_INLINE
-ACE_Active_Map_Manager<T>::~ACE_Active_Map_Manager (void)
+ACE_Active_Map_Manager<T>::~ACE_Active_Map_Manager ()
 {
 }
 
diff --git a/ACE/ace/Addr.cpp b/ACE/ace/Addr.cpp
index 85f3523cf48..0ff38e2a78e 100644
--- a/ACE/ace/Addr.cpp
+++ b/ACE/ace/Addr.cpp
@@ -28,7 +28,7 @@ ACE_Addr::ACE_Addr (int type, int size) :
 {
 }
 
-ACE_Addr::~ACE_Addr (void)
+ACE_Addr::~ACE_Addr ()
 {
 }
 
diff --git a/ACE/ace/Addr.h b/ACE/ace/Addr.h
index e7760cd2f33..512f5268229 100644
--- a/ACE/ace/Addr.h
+++ b/ACE/ace/Addr.h
@@ -34,7 +34,7 @@ public:
   ACE_Addr (int type = -1, int size = -1);
 
   /// Destructor.
-  virtual ~ACE_Addr (void);
+  virtual ~ACE_Addr ();
 
   // = Get/set the size of the address.
 
diff --git a/ACE/ace/Asynch_Acceptor.cpp b/ACE/ace/Asynch_Acceptor.cpp
index c518c3a62fc..7d431ea5af0 100644
--- a/ACE/ace/Asynch_Acceptor.cpp
+++ b/ACE/ace/Asynch_Acceptor.cpp
@@ -34,7 +34,7 @@ ACE_Asynch_Acceptor<HANDLER>::ACE_Asynch_Acceptor (void)
 }
 
 template <class HANDLER>
-ACE_Asynch_Acceptor<HANDLER>::~ACE_Asynch_Acceptor (void)
+ACE_Asynch_Acceptor<HANDLER>::~ACE_Asynch_Acceptor ()
 {
   // Close down the listen socket
   if (this->listen_handle_ != ACE_INVALID_HANDLE)
diff --git a/ACE/ace/Asynch_Connector.cpp b/ACE/ace/Asynch_Connector.cpp
index 5391ca5ad5e..87a119ac065 100644
--- a/ACE/ace/Asynch_Connector.cpp
+++ b/ACE/ace/Asynch_Connector.cpp
@@ -27,7 +27,7 @@ ACE_Asynch_Connector<HANDLER>::ACE_Asynch_Connector (void)
 }
 
 template <class HANDLER>
-ACE_Asynch_Connector<HANDLER>::~ACE_Asynch_Connector (void)
+ACE_Asynch_Connector<HANDLER>::~ACE_Asynch_Connector ()
 {
   //this->asynch_connect_.close ();
 }
diff --git a/ACE/ace/Asynch_Connector.h b/ACE/ace/Asynch_Connector.h
index 584c29fb0dd..d22385bf773 100644
--- a/ACE/ace/Asynch_Connector.h
+++ b/ACE/ace/Asynch_Connector.h
@@ -48,7 +48,7 @@ public:
   ACE_Asynch_Connector (void);
 
   /// Virtual destruction
-  virtual ~ACE_Asynch_Connector (void);
+  virtual ~ACE_Asynch_Connector ();
 
   /**
    * This opens asynch connector
diff --git a/ACE/ace/Auto_Event.h b/ACE/ace/Auto_Event.h
index f01882c62c1..303231d6b38 100644
--- a/ACE/ace/Auto_Event.h
+++ b/ACE/ace/Auto_Event.h
@@ -53,7 +53,7 @@ public:
 #endif /* ACE_HAS_WCHAR */
 
   /// Default dtor.
-  virtual ~ACE_Auto_Event_T (void);
+  virtual ~ACE_Auto_Event_T ();
 
   /// Dump the state of an object.
   void dump (void) const;
diff --git a/ACE/ace/Auto_Event.inl b/ACE/ace/Auto_Event.inl
index 919c048d3ce..a8add6194f6 100644
--- a/ACE/ace/Auto_Event.inl
+++ b/ACE/ace/Auto_Event.inl
@@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class TIME_POLICY>
 ACE_INLINE
-ACE_Auto_Event_T<TIME_POLICY>::~ACE_Auto_Event_T (void)
+ACE_Auto_Event_T<TIME_POLICY>::~ACE_Auto_Event_T ()
 {
 }
 
diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h
index 6626b97b3f4..36682e4dcf2 100644
--- a/ACE/ace/Bound_Ptr.h
+++ b/ACE/ace/Bound_Ptr.h
@@ -43,7 +43,7 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
   ACE_Bound_Ptr_Counter (long init_obj_ref_count = 0);
-  ~ACE_Bound_Ptr_Counter (void);
+  ~ACE_Bound_Ptr_Counter ();
 
   /// Create a ACE_Bound_Ptr_Counter<ACE_LOCK> and initialize the
   /// reference count to indicate ownership by a strong pointer.
diff --git a/ACE/ace/Bound_Ptr.inl b/ACE/ace/Bound_Ptr.inl
index 826c9aa9898..1d3892ee5da 100644
--- a/ACE/ace/Bound_Ptr.inl
+++ b/ACE/ace/Bound_Ptr.inl
@@ -135,7 +135,7 @@ ACE_Bound_Ptr_Counter<ACE_LOCK>::ACE_Bound_Ptr_Counter (long init_obj_ref_count)
 }
 
 template <class ACE_LOCK> inline
-ACE_Bound_Ptr_Counter<ACE_LOCK>::~ACE_Bound_Ptr_Counter (void)
+ACE_Bound_Ptr_Counter<ACE_LOCK>::~ACE_Bound_Ptr_Counter ()
 {
 }
 
diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp
index 32654aeddf8..d02a24e5f39 100644
--- a/ACE/ace/CDR_Stream.cpp
+++ b/ACE/ace/CDR_Stream.cpp
@@ -2363,7 +2363,7 @@ ACE_InputCDR::unregister_monitor (void)
 
 // --------------------------------------------------------------
 
-ACE_Char_Codeset_Translator::~ACE_Char_Codeset_Translator (void)
+ACE_Char_Codeset_Translator::~ACE_Char_Codeset_Translator ()
 {
 }
 
@@ -2380,7 +2380,7 @@ ACE_Char_Codeset_Translator::read_string (ACE_InputCDR &cdr,
 
 // --------------------------------------------------------------
 
-ACE_WChar_Codeset_Translator::~ACE_WChar_Codeset_Translator (void)
+ACE_WChar_Codeset_Translator::~ACE_WChar_Codeset_Translator ()
 {
 }
 
diff --git a/ACE/ace/Cache_Map_Manager_T.cpp b/ACE/ace/Cache_Map_Manager_T.cpp
index b92876a7ffd..6239337e109 100644
--- a/ACE/ace/Cache_Map_Manager_T.cpp
+++ b/ACE/ace/Cache_Map_Manager_T.cpp
@@ -34,7 +34,7 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP
 }
 
 template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES>
-ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::~ACE_Cache_Map_Manager (void)
+ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::~ACE_Cache_Map_Manager ()
 {
   this->close ();
 }
diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h
index da181cb0ed2..137acdcd214 100644
--- a/ACE/ace/Cache_Map_Manager_T.h
+++ b/ACE/ace/Cache_Map_Manager_T.h
@@ -258,7 +258,7 @@ public:
   /// Copy constructor.
   ACE_Cache_Map_Iterator (const ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs);
 
-  virtual ~ACE_Cache_Map_Iterator (void);
+  virtual ~ACE_Cache_Map_Iterator ();
 
   // = Iteration methods.
 
@@ -331,7 +331,7 @@ public:
   /// Copy constructor.
   ACE_Cache_Map_Reverse_Iterator (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs);
 
-  ~ACE_Cache_Map_Reverse_Iterator (void);
+  ~ACE_Cache_Map_Reverse_Iterator ();
 
   // = Iteration methods.
 
diff --git a/ACE/ace/Cache_Map_Manager_T.inl b/ACE/ace/Cache_Map_Manager_T.inl
index dc2a42ef0f5..eacea9a86c2 100644
--- a/ACE/ace/Cache_Map_Manager_T.inl
+++ b/ACE/ace/Cache_Map_Manager_T.inl
@@ -154,7 +154,7 @@ ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRAT
 }
 
 template <class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::~ACE_Cache_Map_Reverse_Iterator (void)
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::~ACE_Cache_Map_Reverse_Iterator ()
 {
 }
 
diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp
index 7987655b4d1..ca2a2d3c90c 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.cpp
+++ b/ACE/ace/Cached_Connect_Strategy_T.cpp
@@ -36,7 +36,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
 }
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX>
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::~ACE_Cached_Connect_Strategy_Ex (void)
+ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::~ACE_Cached_Connect_Strategy_Ex ()
 {
   cleanup ();
 }
@@ -575,7 +575,7 @@ ACE_Bounded_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_S
 }
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX>
-ACE_Bounded_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::~ACE_Bounded_Cached_Connect_Strategy(void)
+ACE_Bounded_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::~ACE_Bounded_Cached_Connect_Strategy ()
 {
 }
 
diff --git a/ACE/ace/Cached_Connect_Strategy_T.h b/ACE/ace/Cached_Connect_Strategy_T.h
index 1ab9fe8e540..50cc9f74d1a 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.h
+++ b/ACE/ace/Cached_Connect_Strategy_T.h
@@ -223,7 +223,7 @@ public:
                                        int delete_lock = 0);
 
   /// Destructor
-  virtual ~ACE_Bounded_Cached_Connect_Strategy (void);
+  virtual ~ACE_Bounded_Cached_Connect_Strategy ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Capabilities.cpp b/ACE/ace/Capabilities.cpp
index 9ffceda2a91..b365730f830 100644
--- a/ACE/ace/Capabilities.cpp
+++ b/ACE/ace/Capabilities.cpp
@@ -13,7 +13,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_CapEntry::~ACE_CapEntry (void)
+ACE_CapEntry::~ACE_CapEntry ()
 {
 }
 
diff --git a/ACE/ace/Capabilities.h b/ACE/ace/Capabilities.h
index e43ace9d2dd..7c19bedb1b1 100644
--- a/ACE/ace/Capabilities.h
+++ b/ACE/ace/Capabilities.h
@@ -40,7 +40,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_CapEntry
 {
 public:
-   virtual ~ACE_CapEntry (void);
+   virtual ~ACE_CapEntry ();
 
 protected:
   enum
diff --git a/ACE/ace/Condition_Attributes.h b/ACE/ace/Condition_Attributes.h
index 06b2676d8ae..1e5a1605f32 100644
--- a/ACE/ace/Condition_Attributes.h
+++ b/ACE/ace/Condition_Attributes.h
@@ -75,7 +75,7 @@ public:
   ACE_Condition_Attributes_T (int type = ACE_DEFAULT_SYNCH_TYPE);
 
   /// Destructor
-  ~ACE_Condition_Attributes_T (void);
+  ~ACE_Condition_Attributes_T ();
 
 private:
   // = Prevent assignment and initialization.
diff --git a/ACE/ace/Condition_Attributes.inl b/ACE/ace/Condition_Attributes.inl
index f63106ad4e0..7efbb2e90b1 100644
--- a/ACE/ace/Condition_Attributes.inl
+++ b/ACE/ace/Condition_Attributes.inl
@@ -30,7 +30,7 @@ ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy>::ACE_Condition_Attributes_
 }
 
 ACE_INLINE
-ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy>::~ACE_Condition_Attributes_T (void)
+ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy>::~ACE_Condition_Attributes_T ()
 {
 }
 
diff --git a/ACE/ace/Message_Queue_Vx.cpp b/ACE/ace/Message_Queue_Vx.cpp
index 15e6d140368..6fd08be7818 100644
--- a/ACE/ace/Message_Queue_Vx.cpp
+++ b/ACE/ace/Message_Queue_Vx.cpp
@@ -112,7 +112,6 @@ ACE_Message_Queue_Vx::open (size_t max_messages,
 }
 
 // Clean up the queue if we have not already done so!
-
 int
 ACE_Message_Queue_Vx::close (void)
 {
@@ -144,7 +143,7 @@ ACE_Message_Queue_Vx::is_full_i (void)
 }
 
 size_t
-ACE_Message_Queue_Vx::high_water_mark (void)
+ACE_Message_Queue_Vx::high_water_mark ()
 {
   ACE_TRACE ("ACE_Message_Queue_Vx::high_water_mark");
   ACE_NOTSUP_RETURN ((size_t) -1);
@@ -158,7 +157,7 @@ ACE_Message_Queue_Vx::high_water_mark (size_t)
 }
 
 size_t
-ACE_Message_Queue_Vx::low_water_mark (void)
+ACE_Message_Queue_Vx::low_water_mark ()
 {
   ACE_TRACE ("ACE_Message_Queue_Vx::low_water_mark");
   // Don't need to guard, because this is fixed.
@@ -174,21 +173,21 @@ ACE_Message_Queue_Vx::low_water_mark (size_t)
 }
 
 size_t
-ACE_Message_Queue_Vx::message_bytes (void)
+ACE_Message_Queue_Vx::message_bytes ()
 {
   ACE_TRACE ("ACE_Message_Queue_Vx::message_bytes");
   ACE_NOTSUP_RETURN ((size_t) -1);
 }
 
 size_t
-ACE_Message_Queue_Vx::message_length (void)
+ACE_Message_Queue_Vx::message_length ()
 {
   ACE_TRACE ("ACE_Message_Queue_Vx::message_length");
   ACE_NOTSUP_RETURN ((size_t) -1);
 }
 
 size_t
-ACE_Message_Queue_Vx::message_count (void)
+ACE_Message_Queue_Vx::message_count ()
 {
   ACE_TRACE ("ACE_Message_Queue_Vx::message_count");
   // Don't need to guard, because this is a system call.
@@ -211,14 +210,14 @@ ACE_Message_Queue_Vx::message_length (size_t)
 }
 
 int
-ACE_Message_Queue_Vx::signal_enqueue_waiters (void)
+ACE_Message_Queue_Vx::signal_enqueue_waiters ()
 {
   // No-op.
   return 0;
 }
 
 int
-ACE_Message_Queue_Vx::signal_dequeue_waiters (void)
+ACE_Message_Queue_Vx::signal_dequeue_waiters ()
 {
   // No-op.
   return 0;
diff --git a/ACE/ace/Message_Queue_Vx.h b/ACE/ace/Message_Queue_Vx.h
index 2ff5a390650..3e98eae9e65 100644
--- a/ACE/ace/Message_Queue_Vx.h
+++ b/ACE/ace/Message_Queue_Vx.h
@@ -74,28 +74,28 @@ public:
                     ACE_Notification_Strategy * = 0);
 
   /// Close down the message queue and release all resources.
-  virtual int close (void);
+  virtual int close ();
 
   /// Close down the message queue and release all resources.
-  virtual ~ACE_Message_Queue_Vx (void);
+  virtual ~ACE_Message_Queue_Vx ();
 
   // = Queue statistic methods.
   /**
    * Number of total bytes on the queue, i.e., sum of the message
    * block sizes.
    */
-  virtual size_t message_bytes (void);
+  virtual size_t message_bytes ();
 
   /**
    * Number of total length on the queue, i.e., sum of the message
    * block lengths.
    */
-  virtual size_t message_length (void);
+  virtual size_t message_length ();
 
   /**
    * Number of total messages on the queue.
    */
-  virtual size_t message_count (void);
+  virtual size_t message_count ();
 
   // = Manual changes to these stats (used when queued message blocks
   // change size or lengths).
@@ -114,13 +114,13 @@ public:
   // = Flow control routines
 
   /// Get high watermark.
-  virtual size_t high_water_mark (void);
+  virtual size_t high_water_mark ();
 
   /// Set high watermark.
   virtual void high_water_mark (size_t hwm);
 
   /// Get low watermark.
-  virtual size_t low_water_mark (void);
+  virtual size_t low_water_mark ();
 
   /// Set low watermark.
   virtual void low_water_mark (size_t lwm);
@@ -164,10 +164,10 @@ protected:
 
   // = Check the boundary conditions (assumes locks are held).
   /// True if queue is full, else false.
-  virtual bool is_full_i (void);
+  virtual bool is_full_i ();
 
   /// True if queue is empty, else false.
-  virtual bool is_empty_i (void);
+  virtual bool is_empty_i ();
 
   // = Implementation of public <activate>/<deactivate> methods above.
 
@@ -181,13 +181,13 @@ protected:
   virtual int wait_not_empty_cond (ACE_Time_Value *tv);
 
   /// Inform any threads waiting to enqueue that they can procede.
-  virtual int signal_enqueue_waiters (void);
+  virtual int signal_enqueue_waiters ();
 
   /// Inform any threads waiting to dequeue that they can procede.
-  virtual int signal_dequeue_waiters (void);
+  virtual int signal_dequeue_waiters ();
 
   /// Access the underlying msgQ.
-  MSG_Q_ID msgq (void);
+  MSG_Q_ID msgq ();
 
 private:
 
@@ -204,10 +204,6 @@ private:
 
   /// Maximum message size, in bytes.
   int max_message_length_;
-
-  /// Native message queue options.
-  int options_;
-
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Message_Queue_Vx.inl b/ACE/ace/Message_Queue_Vx.inl
index e54c62f6f23..0e51325650f 100644
--- a/ACE/ace/Message_Queue_Vx.inl
+++ b/ACE/ace/Message_Queue_Vx.inl
@@ -3,9 +3,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_VXWORKS)
 // Specialization to use native VxWorks Message Queues.
-
 ACE_INLINE MSG_Q_ID
-ACE_Message_Queue_Vx::msgq (void)
+ACE_Message_Queue_Vx::msgq ()
 {
   // Hijack the tail_ field to store the MSG_Q_ID.
   return static_cast<MSG_Q_ID> (
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index ad578f7a383..c833e13de30 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -2562,7 +2562,7 @@ namespace {
       {
         const int result = attributes ?
           ACE_OS::cond_init (&evtdata->condition_, *attributes, name, arg) :
-          ACE_OS::cond_init (&evtdata->condition_, type, name, arg);
+          ACE_OS::cond_init (&evtdata->condition_, (short) type, name, arg);
 
         if (result != 0)
           return result;
@@ -4932,9 +4932,9 @@ spa (FUNCPTR entry, ...)
                                           0, 0, 0, 0, 0, 0, 0, 0);
   va_end (pvar);
 
-  // ::taskSpawn () returns the taskID on success: return 0 instead if
-  // successful
-  return ret > 0 ? 0 : -1;
+  // ::taskSpawn () returns TASK_ID_ERROR on
+  // error
+  return ret == ACE_VX_TASK_ID_ERROR ? -1 : 0;
 }
 #endif /* !ACE_LACKS_VA_FUNCTIONS */
 
@@ -5006,8 +5006,6 @@ add_to_argv (ACE_VX_USR_ARG_T& argc, char** argv, int max_args, char* string)
     }
 }
 
-#if !defined (ACE_LACKS_VA_FUNCTIONS)
-
 // This global function can be used from the VxWorks shell to pass
 // arguments to a C main () function.
 //
@@ -5055,7 +5053,7 @@ spae (FUNCPTR entry, ...)
 
   // ::taskSpawn () returns the taskID on success: return 0 instead if
   // successful
-  return ret > 0 ? 0 : -1;
+  return ret == ACE_VX_TASK_ID_ERROR ? -1 : 0;
 }
 
 // This global function can be used from the VxWorks shell to pass
@@ -5095,14 +5093,13 @@ spaef (FUNCPTR entry, ...)
   for (i = argc; i < ACE_MAX_ARGS; ++i)
     argv[i] = 0;
 
-  int ret = entry (argc, argv);
+  int const ret = entry (argc, argv);
 
   va_end (pvar);
 
   // Return the return value of the invoked ace_main routine.
   return ret;
 }
-#endif /* !ACE_LACKS_VA_FUNCTIONS */
 
 // This global function can be used from the VxWorks shell to pass
 // arguments to and run a main () function (i.e. ace_main).
@@ -5155,12 +5152,12 @@ vx_execae (FUNCPTR entry, char* arg, int prio, int opt, size_t stacksz, ...)
   if (ret == ACE_VX_TASK_ID_ERROR)
     return 255;
 
-  while( ret > 0 && ::taskIdVerify (ret) != ERROR )
+  while( ::taskIdVerify (ret) != ERROR )
     ::taskDelay (3 * ::sysClkRateGet ());
 
-  // ::taskSpawn () returns the taskID on success: return _vx_call_rc instead if
+  // ::taskSpawn () returns TASK_ID_ERROR on failure: return _vx_call_rc instead if
   // successful
-  return ret > 0 ? _vx_call_rc : 255;
+  return ret == ACE_VX_TASK_ID_ERROR ? 255 : _vx_call_rc;
 }
 
 #if defined(ACE_AS_STATIC_LIBS) && defined (ACE_VXWORKS_DEBUGGING_HELPER)
diff --git a/ACE/ace/OS_NS_sys_stat.h b/ACE/ace/OS_NS_sys_stat.h
index cf6e99f3699..50fba77ab6f 100644
--- a/ACE/ace/OS_NS_sys_stat.h
+++ b/ACE/ace/OS_NS_sys_stat.h
@@ -34,8 +34,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-# if defined (_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64  \
-     && defined (ACE_WIN32)
+# if defined (_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined (ACE_WIN32)
 #   if defined (__BORLANDC__)
 typedef struct stati64 ACE_stat;
 #       define ACE_STAT_FUNC_NAME ::_stati64
diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp
index ba803872c35..9550e7b3be4 100644
--- a/ACE/ace/Pagefile_Memory_Pool.cpp
+++ b/ACE/ace/Pagefile_Memory_Pool.cpp
@@ -93,7 +93,7 @@ ACE_Pagefile_Memory_Pool::ACE_Pagefile_Memory_Pool (const ACE_TCHAR *backing_sto
                       ACE_TEXT ("_"));
 }
 
-ACE_Pagefile_Memory_Pool::~ACE_Pagefile_Memory_Pool (void)
+ACE_Pagefile_Memory_Pool::~ACE_Pagefile_Memory_Pool ()
 {
 }
 
diff --git a/ACE/ace/Pagefile_Memory_Pool.h b/ACE/ace/Pagefile_Memory_Pool.h
index 9c5f20337f8..425e810d7de 100644
--- a/ACE/ace/Pagefile_Memory_Pool.h
+++ b/ACE/ace/Pagefile_Memory_Pool.h
@@ -66,7 +66,7 @@ public:
                             const OPTIONS *options = 0);
 
   /// Destructor
-  virtual ~ACE_Pagefile_Memory_Pool (void);
+  virtual ~ACE_Pagefile_Memory_Pool ();
 
   /// Ask system for initial chunk of shared memory.
   void *init_acquire (size_t nbytes,
diff --git a/ACE/ace/Profile_Timer.h b/ACE/ace/Profile_Timer.h
index a28376d44d4..2ebb2e51242 100644
--- a/ACE/ace/Profile_Timer.h
+++ b/ACE/ace/Profile_Timer.h
@@ -54,10 +54,10 @@ public:
   typedef ACE_Rusage Rusage;
 
   /// Default constructor. Clears all time values to 0.
-  ACE_Profile_Timer (void);
+  ACE_Profile_Timer ();
 
   /// Shutdown the timer.
-  ~ACE_Profile_Timer (void);
+  ~ACE_Profile_Timer ();
 
   // = Timer methods.
   /// Activate the timer.
diff --git a/ACE/ace/Profile_Timer.inl b/ACE/ace/Profile_Timer.inl
index 3b52d41954f..d0fd3afc58f 100644
--- a/ACE/ace/Profile_Timer.inl
+++ b/ACE/ace/Profile_Timer.inl
@@ -11,7 +11,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE int
-ACE_Profile_Timer::start (void)
+ACE_Profile_Timer::start ()
 {
   ACE_TRACE ("ACE_Profile_Timer::start");
   return ACE_OS::ioctl (this->proc_handle_,
@@ -20,7 +20,7 @@ ACE_Profile_Timer::start (void)
 }
 
 ACE_INLINE int
-ACE_Profile_Timer::stop (void)
+ACE_Profile_Timer::stop ()
 {
   ACE_TRACE ("ACE_Profile_Timer::stop");
   this->last_usage_ = this->end_usage_;
@@ -36,7 +36,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE int
-ACE_Profile_Timer::start (void)
+ACE_Profile_Timer::start ()
 {
   ACE_TRACE ("ACE_Profile_Timer::start");
   this->begin_time_ = ACE_OS::gettimeofday ();
@@ -46,7 +46,7 @@ ACE_Profile_Timer::start (void)
 }
 
 ACE_INLINE int
-ACE_Profile_Timer::stop (void)
+ACE_Profile_Timer::stop ()
 {
   ACE_TRACE ("ACE_Profile_Timer::stop");
   this->last_time_ = this->end_time_;
@@ -66,12 +66,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Profile_Timer::~ACE_Profile_Timer (void)
+ACE_Profile_Timer::~ACE_Profile_Timer ()
 {
 }
 
 ACE_INLINE int
-ACE_Profile_Timer::start (void)
+ACE_Profile_Timer::start ()
 {
   ACE_TRACE ("ACE_Profile_Timer::start");
 #  if defined (ACE_HAS_GETRUSAGE)
@@ -83,7 +83,7 @@ ACE_Profile_Timer::start (void)
 }
 
 ACE_INLINE int
-ACE_Profile_Timer::stop (void)
+ACE_Profile_Timer::stop ()
 {
   ACE_TRACE ("ACE_Profile_Timer::stop");
   this->timer_.stop ();
@@ -101,7 +101,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE int
-ACE_Profile_Timer::start (void)
+ACE_Profile_Timer::start ()
 {
   ACE_TRACE ("ACE_Profile_Timer::start");
   this->timer_.start ();
@@ -109,7 +109,7 @@ ACE_Profile_Timer::start (void)
 }
 
 ACE_INLINE int
-ACE_Profile_Timer::stop (void)
+ACE_Profile_Timer::stop ()
 {
   ACE_TRACE ("ACE_Profile_Timer::stop");
   this->timer_.stop ();
@@ -117,7 +117,7 @@ ACE_Profile_Timer::stop (void)
 }
 
 ACE_INLINE
-ACE_Profile_Timer::~ACE_Profile_Timer (void)
+ACE_Profile_Timer::~ACE_Profile_Timer ()
 {
 }
 
diff --git a/ACE/ace/README b/ACE/ace/README
index 52fda588d2b..03af7efd882 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -884,9 +884,6 @@ ACE_LACKS_LONGLONG_T                    Compiler/platform does not
 ACE_LACKS_LSTAT                         Platform lacks the lstat() function.
 ACE_LACKS_MADVISE                       Platform lacks madvise()
                                         (e.g., Linux)
-ACE_LACKS_MALLOC_H                      Platform lacks malloc.h
-ACE_LACKS_MEMORY_H                      Platform lacks memory.h (e.g.,
-                                        VxWorks and Chorus)
 ACE_LACKS_MKFIFO                        Platform lacks mkfifo() e.g.,
                                         VxWorks, Chorus, pSoS, and WinNT.
 ACE_LACKS_MKTEMP                        Platform lacks the mktemp() function.
diff --git a/ACE/ace/Recyclable.cpp b/ACE/ace/Recyclable.cpp
index d42aea8a4f4..92c17e244bf 100644
--- a/ACE/ace/Recyclable.cpp
+++ b/ACE/ace/Recyclable.cpp
@@ -1,12 +1,9 @@
 #include "ace/Recyclable.h"
 
-
 #if !defined (__ACE_INLINE__)
 #include "ace/Recyclable.inl"
 #endif /* __ACE_INLINE __ */
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Recyclable::ACE_Recyclable (ACE_Recyclable_State initial_state)
@@ -14,7 +11,7 @@ ACE_Recyclable::ACE_Recyclable (ACE_Recyclable_State initial_state)
 {
 }
 
-ACE_Recyclable::~ACE_Recyclable (void)
+ACE_Recyclable::~ACE_Recyclable ()
 {
 }
 
diff --git a/ACE/ace/Recyclable.h b/ACE/ace/Recyclable.h
index 47d06052f96..8ce2d4bcdd1 100644
--- a/ACE/ace/Recyclable.h
+++ b/ACE/ace/Recyclable.h
@@ -48,7 +48,7 @@ class ACE_Export ACE_Recyclable
 {
 public:
   /// Destructor.
-  virtual ~ACE_Recyclable (void);
+  virtual ~ACE_Recyclable ();
 
   /// Get the recyclable bit
   ACE_Recyclable_State recycle_state (void) const;
diff --git a/ACE/ace/Reverse_Lock_T.cpp b/ACE/ace/Reverse_Lock_T.cpp
index e55e1f47261..3f51006e70f 100644
--- a/ACE/ace/Reverse_Lock_T.cpp
+++ b/ACE/ace/Reverse_Lock_T.cpp
@@ -14,7 +14,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class ACE_LOCKING_MECHANISM>
-ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::~ACE_Reverse_Lock (void)
+ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::~ACE_Reverse_Lock ()
 {
 }
 
diff --git a/ACE/ace/Reverse_Lock_T.h b/ACE/ace/Reverse_Lock_T.h
index f582c3f4986..24b21b27cde 100644
--- a/ACE/ace/Reverse_Lock_T.h
+++ b/ACE/ace/Reverse_Lock_T.h
@@ -81,7 +81,7 @@ public:
 
   /// Destructor. If <lock_> was not passed in by the user, it will be
   /// deleted.
-  virtual ~ACE_Reverse_Lock (void);
+  virtual ~ACE_Reverse_Lock ();
 
   // = Lock accessors.
   /// Release the lock.
diff --git a/ACE/ace/SOCK.h b/ACE/ace/SOCK.h
index 8fa3942c4b1..c76176c9f67 100644
--- a/ACE/ace/SOCK.h
+++ b/ACE/ace/SOCK.h
@@ -122,7 +122,7 @@ protected:
    * operator delete() from being called through a base class ACE_SOCK
    * pointer/reference.
    */
-  ~ACE_SOCK (void);
+  ~ACE_SOCK ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/SOCK_Dgram_Bcast.h b/ACE/ace/SOCK_Dgram_Bcast.h
index 3175ba84a95..91979793f67 100644
--- a/ACE/ace/SOCK_Dgram_Bcast.h
+++ b/ACE/ace/SOCK_Dgram_Bcast.h
@@ -37,7 +37,7 @@ public:
                   ACE_Bcast_Node *);
 
   /// Destructor.
-  ~ACE_Bcast_Node (void);
+  ~ACE_Bcast_Node ();
 
   /// Broadcast address for the interface.
   ACE_INET_Addr bcast_addr_;
diff --git a/ACE/ace/SOCK_Dgram_Bcast.inl b/ACE/ace/SOCK_Dgram_Bcast.inl
index 429afa82e60..85ab84ab120 100644
--- a/ACE/ace/SOCK_Dgram_Bcast.inl
+++ b/ACE/ace/SOCK_Dgram_Bcast.inl
@@ -4,7 +4,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Bcast_Node::~ACE_Bcast_Node (void)
+ACE_Bcast_Node::~ACE_Bcast_Node ()
 {
 }
 
diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp
index fc1bc669b22..e11d8c0b0ef 100644
--- a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp
+++ b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp
@@ -285,7 +285,9 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa
           local_inet_addr.sin_port = 0;
         }
       else
-        local_inet_addr = *reinterpret_cast<sockaddr_in *> (local_sap.get_addr ());
+        {
+          local_inet_addr = *reinterpret_cast<sockaddr_in *> (local_sap.get_addr ());
+        }
 
 //  A port number of 0 means that the user is requesting that the
 //  operating system choose an arbitrary, unused port.  Since some
@@ -415,9 +417,7 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa
                          local_sap.get_size ()) == -1)
     error = 1;
 
-  if (error != 0
-      || ACE_OS::listen (this->get_handle (),
-                         backlog) == -1)
+  if (error != 0 || ACE_OS::listen (this->get_handle (), backlog) == -1)
     {
       error = 1;
       this->close ();
@@ -454,9 +454,7 @@ ACE_SOCK_SEQPACK_Acceptor::open (const ACE_Addr &local_sap,
                       reuse_addr) == -1)
     return -1;
   else
-    return this->shared_open (local_sap,
-                              protocol_family,
-                              backlog);
+    return this->shared_open (local_sap, protocol_family, backlog);
 }
 
 ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap,
diff --git a/ACE/ace/Time_Value.h b/ACE/ace/Time_Value.h
index 4c295c7399c..282a3b2d3e8 100644
--- a/ACE/ace/Time_Value.h
+++ b/ACE/ace/Time_Value.h
@@ -132,7 +132,7 @@ public:
     std::chrono::microseconds const usec {
       std::chrono::duration_cast<std::chrono::microseconds>(
         duration % std::chrono::seconds (1))};
-    this->set (s.count (), ACE_Utils::truncate_cast<suseconds_t>(usec.count ()));
+    this->set (ACE_Utils::truncate_cast<time_t>(s.count ()), ACE_Utils::truncate_cast<suseconds_t>(usec.count ()));
   }
 #endif /* ACE_HAS_CPP11 */
 
diff --git a/ACE/ace/config-WinCE.h b/ACE/ace/config-WinCE.h
index e9414226f7e..1073d19dcac 100644
--- a/ACE/ace/config-WinCE.h
+++ b/ACE/ace/config-WinCE.h
@@ -194,8 +194,6 @@
 # define BUFSIZ 1024
 #endif
 
-#define ACE_LACKS_MALLOC_H      // We do have malloc.h, but don't use it.
-
 #define ACE_HAS_WINCE_BROKEN_ERRNO
 
 #define ACE_HAS_STRDUP_EMULATION
diff --git a/ACE/ace/config-face-conftest.h b/ACE/ace/config-face-conftest.h
index 4cf74e11318..e57b5910679 100644
--- a/ACE/ace/config-face-conftest.h
+++ b/ACE/ace/config-face-conftest.h
@@ -43,7 +43,6 @@
 #define ACE_LACKS_IFREQ
 #define ACE_LACKS_IP_MREQ
 #define ACE_LACKS_ISCTYPE
-#define ACE_LACKS_MEMORY_H
 #define ACE_LACKS_SELECT // safetyBase headers are missing select()
 #define ACE_LACKS_SETENV
 #define ACE_LACKS_SIGINFO_H
diff --git a/ACE/ace/config-freebsd.h b/ACE/ace/config-freebsd.h
index 34fb9c2f7e4..b74c5090861 100644
--- a/ACE/ace/config-freebsd.h
+++ b/ACE/ace/config-freebsd.h
@@ -71,7 +71,6 @@
 #define ACE_LACKS_ISCTYPE
 #define ACE_LACKS_ITOW
 #define ACE_LACKS_LOG2
-#define ACE_LACKS_MALLOC_H
 #define ACE_LACKS_MUTEXATTR_PSHARED
 #define ACE_LACKS_SIGINFO_H
 #define ACE_LACKS_SI_ADDR
diff --git a/ACE/ace/config-integritySCA.h b/ACE/ace/config-integritySCA.h
index 98679878ca8..739f067a4f7 100644
--- a/ACE/ace/config-integritySCA.h
+++ b/ACE/ace/config-integritySCA.h
@@ -138,8 +138,6 @@
 
 /***** Not tied to standards AFAIK ****/
 #define ACE_LACKS_MADVISE /* paging optimization not needed with INTEGRITY */
-#define ACE_LACKS_MALLOC_H /* netbsd's just includes stdlib.h */
-#define ACE_LACKS_MEMORY_H /* netbsd's just includes string.h */
 #define ACE_LACKS_INTTYPES_H
 #define ACE_LACKS_SYS_RESOURCE_H
 #define ACE_LACKS_SYS_WAIT_H
diff --git a/ACE/ace/config-macosx-jaguar.h b/ACE/ace/config-macosx-jaguar.h
index 729c7ffe190..adf672d0f17 100644
--- a/ACE/ace/config-macosx-jaguar.h
+++ b/ACE/ace/config-macosx-jaguar.h
@@ -60,8 +60,6 @@
 
 #define ACE_NEEDS_SCHED_H
 
-#define ACE_LACKS_MALLOC_H
-
 #define ACE_HAS_ALT_CUSERID
 
 // Platform supports POSIX timers via struct timespec.
diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h
index 722a0f3280c..23d9dea5ddd 100644
--- a/ACE/ace/config-macosx-leopard.h
+++ b/ACE/ace/config-macosx-leopard.h
@@ -99,8 +99,6 @@
 
 #define ACE_NEEDS_SCHED_H
 
-#define ACE_LACKS_MALLOC_H
-
 #define ACE_HAS_ALT_CUSERID
 
 // Platform supports POSIX timers via struct timespec.
diff --git a/ACE/ace/config-macosx-panther.h b/ACE/ace/config-macosx-panther.h
index 63237459a2e..1f64b58378c 100644
--- a/ACE/ace/config-macosx-panther.h
+++ b/ACE/ace/config-macosx-panther.h
@@ -55,9 +55,6 @@
 
 #define ACE_NEEDS_SCHED_H
 
-// Use of <malloc.h> is deprecated.
-#define ACE_LACKS_MALLOC_H
-
 #define ACE_HAS_ALT_CUSERID
 
 // Platform supports POSIX timers via struct timespec.
diff --git a/ACE/ace/config-macosx-tiger.h b/ACE/ace/config-macosx-tiger.h
index 1e39c828392..c737a582cb5 100644
--- a/ACE/ace/config-macosx-tiger.h
+++ b/ACE/ace/config-macosx-tiger.h
@@ -84,8 +84,6 @@
 
 #define ACE_NEEDS_SCHED_H
 
-#define ACE_LACKS_MALLOC_H
-
 #define ACE_HAS_ALT_CUSERID
 
 // Platform supports POSIX timers via struct timespec.
diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h
index 28d8c01c6f1..948c9ec07e6 100644
--- a/ACE/ace/config-openvms.h
+++ b/ACE/ace/config-openvms.h
@@ -65,7 +65,6 @@
 #define ACE_LACKS_SEARCH_H 1
 #define ACE_LACKS_SCHED_H 1
 #define ACE_LACKS_SYS_SYSCTL_H 1
-#define ACE_LACKS_MALLOC_H 1
 #define ACE_LACKS_SYS_PARAM_H 1
 #define ACE_LACKS_SIGINFO_H 1
 #define ACE_LACKS_UCONTEXT_H 1
diff --git a/ACE/ace/config-posix-nonetworking.h b/ACE/ace/config-posix-nonetworking.h
index 23e33eccc2d..f30d7fef737 100644
--- a/ACE/ace/config-posix-nonetworking.h
+++ b/ACE/ace/config-posix-nonetworking.h
@@ -16,7 +16,6 @@
 # define ACE_LACKS_NET_IF_H
 # define ACE_LACKS_SYSLOG_H
 # define ACE_LACKS_SYS_UN_H
-# define ACE_LACKS_MEMORY_H
 # define ACE_LACKS_SYS_SYSCTL_H
 # define ACE_LACKS_NETINET_TCP_H
 
diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h
index d6313d754b6..2d0940bfaa9 100644
--- a/ACE/ace/config-sunos5.5.h
+++ b/ACE/ace/config-sunos5.5.h
@@ -37,8 +37,6 @@
 #   define ACE_NEEDS_DEV_IO_CONVERSION
 # elif (__SUNPRO_CC >= 0x420)
 # if (__SUNPRO_CC >= 0x500)
-    // string.h and memory.h conflict for memchr definitions
-#   define ACE_LACKS_MEMORY_H
     // If -compat=4 is turned on, the old 4.2 settings for iostreams are used,
     // but the newer, explicit instantiation is used (above)
 #   if (__SUNPRO_CC_COMPAT >= 5)
diff --git a/ACE/ace/config-vxworks.h b/ACE/ace/config-vxworks.h
index e9b35930a27..2239184cc6f 100644
--- a/ACE/ace/config-vxworks.h
+++ b/ACE/ace/config-vxworks.h
@@ -6,6 +6,10 @@
 #define ACE_CONFIG_VXWORKS_H
 #include /**/ "ace/pre.h"
 
+#if !defined(ACE_VXWORKS_RELEASE)
+# define ACE_VXWORKS_RELEASE ACE_VXWORKS
+#endif
+
 // If ACE_VXWORKS is not defined try to figure out the VxWorks version
 #if !defined (ACE_VXWORKS)
 # include "vxWorks.h"
@@ -53,7 +57,13 @@
 #elif (ACE_VXWORKS == 0x690)
 # include "ace/config-vxworks6.9.h"
 #elif (ACE_VXWORKS == 0x700)
-# include "ace/config-vxworks7.0.h"
+# if (ACE_VXWORKS_RELEASE == 0x2103)
+#   include "ace/config-vxworks21.03.h"
+# elif (ACE_VXWORKS_RELEASE >= 0x2203)
+#   include "ace/config-vxworks22.03.h"
+# else
+#   include "ace/config-vxworks7.0.h"
+# endif
 #else
 # error Unknown or unsupported VxWorks version
 #endif
diff --git a/ACE/ace/config-vxworks21.03.h b/ACE/ace/config-vxworks21.03.h
new file mode 100644
index 00000000000..5d5f8489bea
--- /dev/null
+++ b/ACE/ace/config-vxworks21.03.h
@@ -0,0 +1,71 @@
+/* -*- C++ -*- */
+// The following configuration file is designed to work for VxWorks
+// 21.03 platforms using one of these compilers:
+// 1) The llvm compiler that is shipped with VxWorks 21.03
+
+#ifndef ACE_CONFIG_VXWORKS_21_03_H
+#define ACE_CONFIG_VXWORKS_21_03_H
+#include /**/ "ace/pre.h"
+
+#include "ace/config-vxworks7.0.h"
+
+#if defined (__RTP__)
+# include "semLibCommon.h"
+# define ACE_LACKS_IF_NAMEINDEX
+# define ACE_LACKS_FGETWC
+#else
+# undef ACE_MKDIR_LACKS_MODE
+# define ACE_LACKS_GETPID
+#endif
+
+#undef  ACE_SIZEOF_WCHAR
+#define ACE_SIZEOF_WCHAR 4
+
+#define ACE_HAS_SOCKLEN_T
+
+#undef ACE_LACKS_GETSERVBYNAME
+#undef ACE_LACKS_GETPROTOBYNAME
+#undef ACE_LACKS_GETPROTOBYNUMBER
+#undef ACE_LACKS_GETIPNODEBYADDR
+#undef ACE_LACKS_LSTAT
+#undef ACE_LACKS_MKFIFO
+#undef ACE_LACKS_MKSTEMP
+#undef ACE_LACKS_READLINK
+#undef ACE_LACKS_REALPATH
+#undef ACE_LACKS_PIPE
+#undef ACE_LACKS_UMASK
+#undef ACE_LACKS_TEMPNAM
+#undef ACE_HAS_SIGTIMEDWAIT
+#undef ACE_HAS_SIGSUSPEND
+#undef ACE_HAS_GETIFADDRS
+
+#undef ACE_LACKS_SETEGID
+#undef ACE_LACKS_SETUID
+#undef ACE_LACKS_SETEUID
+#undef ACE_LACKS_GETEUID
+#undef ACE_LACKS_GETUID
+#undef ACE_LACKS_GETEGID
+#undef ACE_LACKS_GETGID
+#undef ACE_LACKS_SETGID
+
+#undef ACE_LACKS_SYS_UIO_H
+#undef ACE_LACKS_TERMIOS_H
+#undef ACE_LACKS_FCNTL
+#undef ACE_HAS_CHARPTR_SOCKOPT
+
+#undef ACE_LACKS_INTPTR_T
+#undef ACE_LACKS_INTTYPES_H
+#undef ACE_LACKS_STDINT_H
+#undef ACE_LACKS_SYS_TIME_H
+#undef ACE_LACKS_SYS_SELECT_H
+#undef ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R
+#undef ACE_LACKS_SEARCH_H
+
+#undef ACE_LACKS_TZSET
+#undef ACE_LACKS_ISWCTYPE
+#undef ACE_LACKS_ISBLANK
+
+#undef ACE_LACKS_RAND_R
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_VXWORKS_21_03_H */
diff --git a/ACE/ace/config-vxworks22.03.h b/ACE/ace/config-vxworks22.03.h
new file mode 100644
index 00000000000..3b1bfed81b6
--- /dev/null
+++ b/ACE/ace/config-vxworks22.03.h
@@ -0,0 +1,13 @@
+/* -*- C++ -*- */
+// The following configuration file is designed to work for VxWorks
+// 22.03 platforms using one of these compilers:
+// 1) The llvm compiler that is shipped with VxWorks 22.03
+
+#ifndef ACE_CONFIG_VXWORKS_22_03_H
+#define ACE_CONFIG_VXWORKS_22_03_H
+#include /**/ "ace/pre.h"
+
+#include "ace/config-vxworks21.03.h"
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_VXWORKS_22_03_H */
diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h
index 260c559a563..b09dc33deba 100644
--- a/ACE/ace/config-vxworks6.4.h
+++ b/ACE/ace/config-vxworks6.4.h
@@ -24,14 +24,6 @@
 # define ACE_LACKS_STD_WSTRING
 #endif
 
-#if !defined (__RTP__)
-  // Fix for wrong typedef of time_t in kernel mode
-  #ifndef _TIME_T
-  #define _TIME_T
-  typedef long time_t;
-  #endif
-#endif
-
 #if ! defined (__ACE_INLINE__)
 # define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
@@ -135,8 +127,6 @@
 #define ACE_LACKS_GETIPNODEBYNAME_IPV6
 #define ACE_LACKS_LSTAT
 #define ACE_LACKS_MADVISE
-#define ACE_LACKS_MALLOC_H
-#define ACE_LACKS_MEMORY_H
 #define ACE_LACKS_MKFIFO
 #define ACE_LACKS_MKSTEMP
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
diff --git a/ACE/ace/config-vxworks6.8.h b/ACE/ace/config-vxworks6.8.h
index 56d805d0864..58fd16af2da 100644
--- a/ACE/ace/config-vxworks6.8.h
+++ b/ACE/ace/config-vxworks6.8.h
@@ -14,7 +14,6 @@
 
 #include "ace/config-vxworks6.7.h"
 
-
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_VXWORKS_6_8_H */
 
diff --git a/ACE/include/makeinclude/platform_vxworks7.0.GNU b/ACE/include/makeinclude/platform_vxworks7.0.GNU
index 5d930edb45d..17bd9b19464 100644
--- a/ACE/include/makeinclude/platform_vxworks7.0.GNU
+++ b/ACE/include/makeinclude/platform_vxworks7.0.GNU
@@ -76,6 +76,10 @@ endif
 VXWORKS_VERSION_FLAG ?= -DACE_VXWORKS=0x700
 CPPFLAGS += $(VXWORKS_VERSION_FLAG)
 
+ifneq ($(WIND_RELEASE_ID), )
+  CPPFLAGS += -DACE_VXWORKS_RELEASE=0x$(subst .,,$(WIND_RELEASE_ID))
+endif
+
 ifeq ($(pthread),1)
   CPPFLAGS += -DACE_HAS_PTHREADS
 endif
@@ -102,6 +106,20 @@ endif
 ace_vx_mk_dir = $(if $(findstring 1,$(rtp)),$(WIND_USR_MK),$(WIND_KRNL_MK))
 include $(ace_vx_mk_dir)/defs.library.mk
 
+ifneq ($(rtp),0)
+  ## If we are building rtp and using the llvm (clang) compiler, we need to
+  ## use the linker directly to create shared libraries and executables.
+  ifeq ($(TOOL),llvm)
+    LLD = $(__WRS_TOOL_PATH)/ld$(TOOLENV)
+    define LINK.cc.override
+$(LLD) $(LDFLAGS) $(LD_EMULATION) --allow-shlib-undefined -EL $(VSB_DIR)/usr/lib/common/crt0.o -o $@ $(filter %.o,$^) --start-group --as-needed $(LDLIBS) -lc -lc_internal -lllvm -lcplusplus -lllvmcplus -lnet -ldl --end-group
+    endef
+    define SOLINK.cc.override
+$(LLD) $(LDFLAGS) $(LD_EMULATION) -shared --exclude-libs libc_internal.a -u __init -u __fini -o $@ $(filter %.o,$^) --start-group --as-needed $(ACE_SHLIBS) -lc -lc_internal -lcplusplus -lnet --end-group
+    endef
+  endif
+endif
+
 dkm_libstdcpp ?= $(if $(findstring y,$(_WRS_CONFIG_PRI_diab)),1,0)
 ifeq ($(dkm_libstdcpp),1)
   DKM_LIBS += -L$(VSB_DIR)/krnl/gnu_standard --start-group -lstl -lgnucplus --end-group
diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU
index 025c4aceb35..ffbd1f82a28 100644
--- a/ACE/include/makeinclude/rules.local.GNU
+++ b/ACE/include/makeinclude/rules.local.GNU
@@ -293,11 +293,17 @@ $(INSMAN)/manl/% \
 $(INSMAN)/mann/% :
 	@$(MKDIR) $(@D)
 ifeq ($(vxworks_ntbuild),1)
+  ifeq ($(SOVERSION),)
+	@if not "$(ARCH_SOURCE_DIR)/$(@F)" == "$@" \
+		echo $(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $@ && \
+		$(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $@
+  else
 	@if not exist $@ $(RM) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) && \
 		$(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) && \
 		$(RM) $@ && \
 		echo $(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $@ && \
 		$(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $@
+  endif #SOVERSION
 else #not vxworks_ntbuild
     ifeq ($(firstword $(LN_S)),cp)
       ifneq ($(SOVERSION),)