Merge branch 'DOCGroup:master' into master

29 files changed, 75 insertions, 195 deletions

diff --git a/ACE/ace/Compression/Compressor.cpp b/ACE/ace/Compression/Compressor.cpp
index 4c1d2d20247..f2c31e1fe05 100644
--- a/ACE/ace/Compression/Compressor.cpp
+++ b/ACE/ace/Compression/Compressor.cpp
@@ -6,8 +6,8 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Compressor::ACE_Compressor( ACE_CompressorId compressor_id,
-                                ACE_UINT32 compression_level )
+ACE_Compressor::ACE_Compressor(ACE_CompressorId compressor_id,
+                               ACE_UINT32 compression_level)
     : compressor_id_        (compressor_id)
     , compression_level_    (compression_level)
     , compressed_bytes_     (0)
@@ -33,7 +33,7 @@ ACE_Compressor::uncompressed_bytes() const
 }
 
 void
-ACE_Compressor::reset_stats(void)
+ACE_Compressor::reset_stats()
 {
     ACE_GUARD( ACE_SYNCH_MUTEX, ace_mon, this->mutex_ );
     this->compressed_bytes_   = 0;
diff --git a/ACE/ace/Compression/Compressor.h b/ACE/ace/Compression/Compressor.h
index 58c8207e1f5..0ef800fe868 100644
--- a/ACE/ace/Compression/Compressor.h
+++ b/ACE/ace/Compression/Compressor.h
@@ -48,9 +48,9 @@ enum ACE_CompressorId
 class ACE_Compression_Export ACE_Compressor
 {
 public:
-  ACE_CompressorId    get_compressor_id() const;
+  ACE_CompressorId get_compressor_id() const;
 
-  ACE_UINT32          get_compression_level() const;
+  ACE_UINT32 get_compression_level() const;
 
   /**
     * Compress the @a in_ptr buffer for @a in_len into the
@@ -65,10 +65,10 @@ public:
     * for the possibility that a reduced compressed length
     * is not possible.
     */
-  virtual ACE_UINT64 compress( const void *in_ptr,
-                                ACE_UINT64 in_len,
-                                void *out_ptr,
-                                ACE_UINT64 max_out_len ) = 0;
+  virtual ACE_UINT64 compress(const void *in_ptr,
+                              ACE_UINT64 in_len,
+                              void *out_ptr,
+                              ACE_UINT64 max_out_len) = 0;
 
   /**
     * DeCompress the @a in_ptr buffer for @a in_len into the
@@ -78,45 +78,45 @@ public:
     * otherwise the return value will indicate the resultant
     * @a out_ptr decompressed buffer length.
     */
-  virtual ACE_UINT64 decompress( const void *in_ptr,
-                                  ACE_UINT64 in_len,
-                                  void *out_ptr,
-                                  ACE_UINT64 max_out_len ) = 0;
+  virtual ACE_UINT64 decompress(const void *in_ptr,
+                                ACE_UINT64 in_len,
+                                void *out_ptr,
+                                ACE_UINT64 max_out_len) = 0;
 
   /**
     *  Return the current compressed bytes statistics counter.
     */
-  virtual ACE_UINT64  compressed_bytes() const;
+  virtual ACE_UINT64 compressed_bytes() const;
 
   /**
     *  Return the current uncompressed bytes statistics counter.
     */
-  virtual ACE_UINT64  uncompressed_bytes() const;
+  virtual ACE_UINT64 uncompressed_bytes() const;
 
   /**
     *  Return the current compression ratio statistics.
     */
-  virtual float       compression_ratio() const;
+  virtual float compression_ratio() const;
 
   /**
     *  Reset the statistics to zero.
     */
-  virtual void        reset_stats(void);
+  virtual void reset_stats();
 
-  virtual ~ACE_Compressor (void);
+  virtual ~ACE_Compressor ();
 
 protected:
   ACE_Compressor(ACE_CompressorId compressor_id,
-                  ACE_UINT32 compression_level = 0); // Must be inherited.
+                 ACE_UINT32 compression_level = 0); // Must be inherited.
 
-  virtual void update_stats(  ACE_UINT64 uncompressed_bytes,
-                              ACE_UINT64 compressed_bytes );
+  virtual void update_stats(ACE_UINT64 uncompressed_bytes,
+                            ACE_UINT64 compressed_bytes);
 
 private:
   ACE_CompressorId    compressor_id_;
   ACE_UINT32          compression_level_;
 
-  // Ensure we can lock with imutability (i.e. const)
+  // Ensure we can lock with immutability (i.e. const)
   mutable ACE_SYNCH_MUTEX mutex_;
 
   ACE_UINT64          compressed_bytes_;
diff --git a/ACE/ace/Compression/Compressor.inl b/ACE/ace/Compression/Compressor.inl
index 21914ac1063..98af661bbea 100644
--- a/ACE/ace/Compression/Compressor.inl
+++ b/ACE/ace/Compression/Compressor.inl
@@ -4,13 +4,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_INLINE ACE_CompressorId
 ACE_Compressor::get_compressor_id() const
 {
-    return this->compressor_id_;
+  return this->compressor_id_;
 }
 
 ACE_INLINE ACE_UINT32
 ACE_Compressor::get_compression_level() const
 {
-    return this->compression_level_;
+  return this->compression_level_;
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Compression/rle/RLECompressor.cpp b/ACE/ace/Compression/rle/RLECompressor.cpp
index 8e83df4dcfc..0c852ad9784 100644
--- a/ACE/ace/Compression/rle/RLECompressor.cpp
+++ b/ACE/ace/Compression/rle/RLECompressor.cpp
@@ -1,27 +1,19 @@
 #include "RLECompressor.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750)
-#  pragma option push -w-8072
-#endif
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_RLECompressor::ACE_RLECompressor(void)
+ACE_RLECompressor::ACE_RLECompressor()
     : ACE_Compressor(ACE_COMPRESSORID_RLE)
 {
 }
 
-ACE_RLECompressor::~ACE_RLECompressor(void)
-{
-}
-
 // Compress using Run Length Encoding (RLE)
 ACE_UINT64
-ACE_RLECompressor::compress( const void *in_ptr,
-                             ACE_UINT64 in_len,
-                             void *out_ptr,
-                             ACE_UINT64 max_out_len )
+ACE_RLECompressor::compress(const void *in_ptr,
+                            ACE_UINT64 in_len,
+                            void *out_ptr,
+                            ACE_UINT64 max_out_len)
 {
     const ACE_Byte *in_p    = static_cast<const ACE_Byte *>(in_ptr);
     ACE_Byte *out_p         = static_cast<ACE_Byte *>(out_ptr);
@@ -96,10 +88,10 @@ ACE_RLECompressor::compress( const void *in_ptr,
 
 // Decompress using Run Length Encoding (RLE)
 ACE_UINT64
-ACE_RLECompressor::decompress( const void *in_ptr,
-                               ACE_UINT64 in_len,
-                               void *out_ptr,
-                               ACE_UINT64 max_out_len )
+ACE_RLECompressor::decompress(const void *in_ptr,
+                              ACE_UINT64 in_len,
+                              void *out_ptr,
+                              ACE_UINT64 max_out_len)
 {
     ACE_UINT64  out_len     = 0;
 
@@ -140,6 +132,3 @@ ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_RLECompressor, ACE_SYNCH_M
 // Close versioned namespace, if enabled by the user.
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750)
-# pragma option pop
-#endif
diff --git a/ACE/ace/Compression/rle/RLECompressor.h b/ACE/ace/Compression/rle/RLECompressor.h
index 81640155395..bce7cf2280f 100644
--- a/ACE/ace/Compression/rle/RLECompressor.h
+++ b/ACE/ace/Compression/rle/RLECompressor.h
@@ -57,9 +57,9 @@ public:
   /**
   * Default constructor. Should use instance() to get global instance.
   */
-  ACE_RLECompressor(void);
+  ACE_RLECompressor();
 
-  virtual ~ACE_RLECompressor(void);
+  ~ACE_RLECompressor() override = default;
 
   /**
   * Compress the @a in_ptr buffer for @a in_len into the
@@ -75,10 +75,10 @@ public:
   * for the possibility that a reduced compressed length
   * is not possible.
   */
-  virtual ACE_UINT64 compress( const void *in_ptr,
-                                ACE_UINT64 in_len,
-                                void *out_ptr,
-                                ACE_UINT64 max_out_len );
+  ACE_UINT64 compress(const void *in_ptr,
+                      ACE_UINT64 in_len,
+                      void *out_ptr,
+                      ACE_UINT64 max_out_len) override;
 
   /**
   * DeCompress the @a in_ptr buffer for @a in_len into the
@@ -89,10 +89,10 @@ public:
   * otherwise the return value will indicate the resultant
   * @a out_ptr decompressed buffer length.
   */
-  virtual ACE_UINT64 decompress( const void *in_ptr,
-                                  ACE_UINT64 in_len,
-                                  void *out_ptr,
-                                  ACE_UINT64 max_out_len );
+  ACE_UINT64 decompress(const void *in_ptr,
+                        ACE_UINT64 in_len,
+                        void *out_ptr,
+                        ACE_UINT64 max_out_len) override;
 };
 
 ACE_RLECOMPRESSION_SINGLETON_DECLARE(ACE_Singleton, ACE_RLECompressor, ACE_SYNCH_MUTEX);
diff --git a/ACE/ace/Handle_Set.cpp b/ACE/ace/Handle_Set.cpp
index 325512fe7c1..1ca26071fd3 100644
--- a/ACE/ace/Handle_Set.cpp
+++ b/ACE/ace/Handle_Set.cpp
@@ -1,4 +1,3 @@
-// Handle_Set.cpp
 #include "ace/Handle_Set.h"
 #if defined (ACE_HAS_ALLOC_HOOKS)
 # include "ace/Malloc_Base.h"
diff --git a/ACE/ace/Handle_Set.inl b/ACE/ace/Handle_Set.inl
index cd78f17e2e5..60e31a21a9c 100644
--- a/ACE/ace/Handle_Set.inl
+++ b/ACE/ace/Handle_Set.inl
@@ -8,7 +8,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// Initialize the bitmask to all 0s and reset the associated fields.
+/// Initialize the bitmask to all 0s and reset the associated fields.
 ACE_INLINE void
 ACE_Handle_Set::reset ()
 {
@@ -63,8 +63,7 @@ ACE_Handle_Set::ACE_Handle_Set (const ACE_Handle_Set &rhs)
 }
 #endif /* ACE_HAS_BIG_FD_SET */
 
-// Returns the number of the large bit.
-
+/// Returns the number of the large bit.
 ACE_INLINE ACE_HANDLE
 ACE_Handle_Set::max_set () const
 {
@@ -72,8 +71,7 @@ ACE_Handle_Set::max_set () const
   return this->max_handle_;
 }
 
-// Checks whether handle is enabled.
-
+/// Checks whether handle is enabled.
 ACE_INLINE int
 ACE_Handle_Set::is_set (ACE_HANDLE handle) const
 {
@@ -90,8 +88,7 @@ ACE_Handle_Set::is_set (ACE_HANDLE handle) const
   return ret;
 }
 
-// Enables the handle.
-
+/// Enables the handle.
 ACE_INLINE void
 ACE_Handle_Set::set_bit (ACE_HANDLE handle)
 {
@@ -122,8 +119,7 @@ ACE_Handle_Set::set_bit (ACE_HANDLE handle)
     }
 }
 
-// Disables the handle.
-
+/// Disables the handle.
 ACE_INLINE void
 ACE_Handle_Set::clr_bit (ACE_HANDLE handle)
 {
@@ -143,8 +139,7 @@ ACE_Handle_Set::clr_bit (ACE_HANDLE handle)
     }
 }
 
-// Returns a count of the number of enabled bits.
-
+/// Returns a count of the number of enabled bits.
 ACE_INLINE int
 ACE_Handle_Set::num_set () const
 {
@@ -165,7 +160,7 @@ ACE_Handle_Set::operator fd_set *()
   if (this->size_ > 0)
     return (fd_set *) &this->mask_;
   else
-    return (fd_set *) 0;
+    return nullptr;
 }
 
 /// Returns a pointer to the underlying fd_set.
@@ -177,7 +172,7 @@ ACE_Handle_Set::fdset ()
   if (this->size_ > 0)
     return (fd_set *) &this->mask_;
   else
-    return (fd_set *) 0;
+    return nullptr;
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h
index 3ba96b67427..673d8425d4a 100644
--- a/ACE/ace/OS_NS_stdlib.h
+++ b/ACE/ace/OS_NS_stdlib.h
@@ -310,11 +310,9 @@ namespace ACE_OS {
   extern ACE_Export
   ACE_TCHAR *strenvdup (const ACE_TCHAR *str);
 
-#if !defined (ACE_LACKS_STRTOD)
   /// Converts a string to a double value (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   double strtod (const char *s, char **endptr);
-#endif /* !ACE_LACKS_STRTOD */
 
 #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOD)
   /// Converts a string to a double value (wchar_t version).
diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl
index 33484924803..b76ee71c5bd 100644
--- a/ACE/ace/OS_NS_stdlib.inl
+++ b/ACE/ace/OS_NS_stdlib.inl
@@ -483,13 +483,11 @@ ACE_OS::srand (u_int seed)
 #endif
 }
 
-#if !defined (ACE_LACKS_STRTOD)
 ACE_INLINE double
 ACE_OS::strtod (const char *s, char **endptr)
 {
   return ::strtod (s, endptr);
 }
-#endif /* !ACE_LACKS_STRTOD */
 
 #if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOD)
 ACE_INLINE double
diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp
index 5180362bea6..a946a56994d 100644
--- a/ACE/ace/SOCK_Dgram.cpp
+++ b/ACE/ace/SOCK_Dgram.cpp
@@ -672,7 +672,6 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq,
       ACE_INET_Addr interface_addr;
       if (interface_addr.set (mcast_addr.get_port_number (), net_if) == -1)
         {
-#if defined (ACE_WIN32)
           IP_ADAPTER_ADDRESSES tmp_addrs;
           // Initial call to determine actual memory size needed
           ULONG bufLen = 0;
@@ -716,15 +715,12 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq,
               errno = EINVAL;
               return -1;
             }
-#else
-          ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_WIN32 */
         }
       lmreq.imr_interface.s_addr =
         ACE_HTONL (interface_addr.get_ip_address ());
 #else
       ifreq if_address;
-      ACE_OS::strcpy (if_address.ifr_name, ACE_TEXT_ALWAYS_CHAR (net_if));
+      ACE_OS::strncpy (if_address.ifr_name, ACE_TEXT_ALWAYS_CHAR (net_if), sizeof if_address.ifr_name);
       if (ACE_OS::ioctl (this->get_handle (),
                          SIOCGIFADDR,
                          &if_address) == -1)
diff --git a/ACE/ace/SOCK_Dgram_Bcast.cpp b/ACE/ace/SOCK_Dgram_Bcast.cpp
index b3bf9c9f774..903bfd742ea 100644
--- a/ACE/ace/SOCK_Dgram_Bcast.cpp
+++ b/ACE/ace/SOCK_Dgram_Bcast.cpp
@@ -222,7 +222,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
                          SIOCGIFFLAGS,
                          (char *) &flags) == -1)
         {
-          ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"),
+          ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%C]\n"),
                      ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)"),
                      flags.ifr_name));
           continue;
@@ -231,7 +231,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
       if (ACE_BIT_ENABLED (flags.ifr_flags,
                            IFF_UP) == 0)
         {
-          ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"),
+          ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%C]\n"),
                      ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up"),
                      flags.ifr_name));
           continue;
@@ -247,7 +247,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
           if (ACE_OS::ioctl (s,
                              SIOCGIFBRDADDR,
                              (char *) &if_req) == -1)
-            ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"),
+            ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%C]\n"),
                        ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)"),
                        flags.ifr_name));
           else
@@ -264,7 +264,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
       else
         {
           if (host_name != 0)
-            ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"),
+            ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%C]\n"),
                         ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enabled for this interface."),
                         flags.ifr_name));
         }
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index 6ec7c70d32d..911f1e523ca 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,7 +4,7 @@
 
 #define ACE_MAJOR_VERSION 7
 #define ACE_MINOR_VERSION 0
-#define ACE_MICRO_VERSION 2
-#define ACE_VERSION "7.0.2"
-#define ACE_VERSION_CODE 0x70002
+#define ACE_MICRO_VERSION 3
+#define ACE_VERSION "7.0.3"
+#define ACE_VERSION_CODE 0x70003
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h
index afe100a524c..e8f610274b6 100644
--- a/ACE/ace/config-aix-5.x.h
+++ b/ACE/ace/config-aix-5.x.h
@@ -219,8 +219,6 @@
 
 #define ACE_HAS_UCONTEXT_T
 
-#define ACE_HAS_UTIME
-
 #define ACE_HAS_CTYPE_T
 
 // Platform has XPG4 wide character type and functions. However, the size
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index 3e13ecba237..794b1296304 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -128,12 +128,10 @@
 # endif /* !__MT__ */
 #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 
-#if (__BORLANDC__ <= 0x750)
-# define ACE_LACKS_ISWCTYPE
-# define ACE_LACKS_ISCTYPE
-# define ACE_LACKS_STRTOK_R
-# define ACE_LACKS_ASCTIME_R
-#endif
+#define ACE_LACKS_ISWCTYPE
+#define ACE_LACKS_ISCTYPE
+#define ACE_LACKS_STRTOK_R
+#define ACE_LACKS_ASCTIME_R
 
 #if (__BORLANDC__ <= 0x740)
 # define ACE_LACKS_LOCALTIME_R
@@ -145,7 +143,7 @@
 #define ACE_STRNCASECMP_EQUIVALENT ::strnicmp
 #define ACE_WTOF_EQUIVALENT ::_wtof
 #define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X)))
-#define ACE_HAS_ITOA 1
+#define ACE_HAS_ITOA
 
 #if defined (ACE_HAS_BCC64)
 # if (__BORLANDC__ <= 0x730)
diff --git a/ACE/ace/os_include/os_aio.h b/ACE/ace/os_include/os_aio.h
index 0d2ffe0802c..4372f5a5fb0 100644
--- a/ACE/ace/os_include/os_aio.h
+++ b/ACE/ace/os_include/os_aio.h
@@ -31,15 +31,5 @@
 # include /**/ <aio.h>
 #endif /* !ACE_LACKS_AIO_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_AIO_H */
diff --git a/ACE/ace/os_include/os_float.h b/ACE/ace/os_include/os_float.h
index f6539c59b5e..30a459df1e9 100644
--- a/ACE/ace/os_include/os_float.h
+++ b/ACE/ace/os_include/os_float.h
@@ -22,9 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (ACE_LACKS_FLOAT_H)
-# include /**/ <float.h>
-#endif /* !ACE_LACKS_FLOAT_H */
+#include /**/ <float.h>
 
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_FLOAT_H */
diff --git a/ACE/ace/os_include/os_stdarg.h b/ACE/ace/os_include/os_stdarg.h
index c93ffb03530..bef41b75cf4 100644
--- a/ACE/ace/os_include/os_stdarg.h
+++ b/ACE/ace/os_include/os_stdarg.h
@@ -22,9 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (ACE_LACKS_STDARG_H)
-# include /**/ <stdarg.h>
-#endif /* !ACE_LACKS_STDARG_H */
+#include /**/ <stdarg.h>
 
 #if !defined (va_copy)
 #if defined (__va_copy)
diff --git a/ACE/ace/os_include/os_stdbool.h b/ACE/ace/os_include/os_stdbool.h
index b4c1c141cfc..7cb2ae95a19 100644
--- a/ACE/ace/os_include/os_stdbool.h
+++ b/ACE/ace/os_include/os_stdbool.h
@@ -22,9 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (ACE_LACKS_STDBOOL_H)
-# include /**/ <stdbool.h>
-#endif /* !ACE_LACKS_STDBOOL_H */
+#include /**/ <stdbool.h>
 
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_STDBOOL_H */
diff --git a/ACE/ace/os_include/os_stddef.h b/ACE/ace/os_include/os_stddef.h
index 625a8a44f6f..cf165a624cd 100644
--- a/ACE/ace/os_include/os_stddef.h
+++ b/ACE/ace/os_include/os_stddef.h
@@ -24,50 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (ACE_LACKS_STDDEF_H)
-#  include /**/ <stddef.h>
-#endif /* !ACE_LACKS_STDDEF_H */
-
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-//  Signed integer type of the result of subtracting two pointers.
-#if defined (ACE_LACKS_PTRDIFF_T)
-#  if !defined (ACE_PTRDIFF_T_TYPE)
-#    define ACE_PTRDIFF_T_TYPE unsigned long
-#  endif /* !ACE_PTRDIFF_T_TYPE */
-   typedef ACE_PTRDIFF_T_TYPE ptrdiff_t;
-#endif /* ACE_LACKS_PTRDIFF_T */
-
-/*
-  Integer type whose range of values can represent distinct wide-character
-  codes for all members of the largest character set specified among the
-  locales supported by the compilation environment: the null character has
-  the code value 0 and each member of the portable character set has a code
-  value equal to its value when used as the lone character in an integer
-  character constant.
-*/
-#if defined (ACE_LACKS_WCHAR_T)
-#  if !defined (ACE_WCHAR_T_TYPE)
-#    define ACE_WCHAR_T_TYPE long
-#  endif /* !ACE_WCHAR_T_TYPE */
-   typedef ACE_WCHAR_T_TYPE wchar_t;
-#endif /* ACE_LACKS_WCHAR_T */
-
-//  Unsigned integer type of the result of the sizeof operator.
-#if defined (ACE_LACKS_SIZE_T)
-#  if !defined (ACE_SIZE_T_TYPE)
-#    define ACE_SIZE_T_TYPE unsigned int
-#  endif /* !ACE_SIZE_T_TYPE */
-   typedef ACE_SIZE_T_TYPE size_t;
-#endif /* ACE_LACKS_SIZE_T */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+#include /**/ <stddef.h>
 
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_STDDEF_H */
diff --git a/ACE/ace/os_include/os_stdlib.h b/ACE/ace/os_include/os_stdlib.h
index e3a5d6d3dbe..c1c84063efe 100644
--- a/ACE/ace/os_include/os_stdlib.h
+++ b/ACE/ace/os_include/os_stdlib.h
@@ -30,9 +30,7 @@
 #   include /**/ <alloca.h>
 #endif /* ACE_HAS_ALLOCA_H */
 
-#if !defined (ACE_LACKS_STDLIB_H)
-#  include /**/ <stdlib.h>
-#endif /* !ACE_LACKS_STDLIB_H */
+#include /**/ <stdlib.h>
 
 #if defined (ACE_VXWORKS) && !defined (__RTP__)
 #  include /**/ <envLib.h>
diff --git a/ACE/ace/os_include/os_string.h b/ACE/ace/os_include/os_string.h
index 3b6d34356ca..3de55107cb8 100644
--- a/ACE/ace/os_include/os_string.h
+++ b/ACE/ace/os_include/os_string.h
@@ -23,10 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/os_include/os_stddef.h"
-
-#if !defined (ACE_LACKS_STRING_H)
-# include /**/ <string.h>
-#endif /* !ACE_LACKS_STRING_H */
+#include /**/ <string.h>
 
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_STRING_H */
diff --git a/ACE/ace/os_include/os_strings.h b/ACE/ace/os_include/os_strings.h
index e056af75b01..649acc74ff1 100644
--- a/ACE/ace/os_include/os_strings.h
+++ b/ACE/ace/os_include/os_strings.h
@@ -28,15 +28,5 @@
 #  include /**/ <strings.h>
 #endif /* !ACE_LACKS_STRINGS_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_STRINGS_H */
diff --git a/ACE/ace/os_include/os_time.h b/ACE/ace/os_include/os_time.h
index e6c43cbdf27..5970afb2d65 100644
--- a/ACE/ace/os_include/os_time.h
+++ b/ACE/ace/os_include/os_time.h
@@ -34,9 +34,7 @@
 #  include /**/ <sys/time.h>
 #endif /* !ACE_LACKS_SYS_TIME_H */
 
-#if !defined (ACE_LACKS_TIME_H)
-#  include /**/ <time.h>
-#endif /* !ACE_LACKS_TIME_H */
+#include /**/ <time.h>
 
 #if defined (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB) && \
             (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB != 0)
diff --git a/ACE/ace/os_include/os_typeinfo.h b/ACE/ace/os_include/os_typeinfo.h
index 7f33a689b45..e6b12dd96de 100644
--- a/ACE/ace/os_include/os_typeinfo.h
+++ b/ACE/ace/os_include/os_typeinfo.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-# include /**/ <typeinfo>
+#include /**/ <typeinfo>
 
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_TYPEINFO_H */
diff --git a/ACE/ace/os_include/os_ulimit.h b/ACE/ace/os_include/os_ulimit.h
index 5033bf6f1d1..1c98215f109 100644
--- a/ACE/ace/os_include/os_ulimit.h
+++ b/ACE/ace/os_include/os_ulimit.h
@@ -22,9 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if !defined (ACE_LACKS_ULIMIT_H)
-#  include /**/ <ulimit.h>
-#endif /* !ACE_LACKS_ULIMIT_H */
+#include /**/ <ulimit.h>
 
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_ULIMIT_H */
diff --git a/ACE/ace/os_include/os_utime.h b/ACE/ace/os_include/os_utime.h
index 4d7e7627917..38f03f16fec 100644
--- a/ACE/ace/os_include/os_utime.h
+++ b/ACE/ace/os_include/os_utime.h
@@ -23,10 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/os_include/sys/os_types.h"
-
-#if !defined (ACE_LACKS_UTIME_H)
-#  include /**/ <utime.h>
-#endif /* !ACE_LACKS_UTIME_H */
+#include /**/ <utime.h>
 
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_UTIME_H */
diff --git a/ACE/ace/os_include/os_wordexp.h b/ACE/ace/os_include/os_wordexp.h
index e4a2bd3c7df..540907904f5 100644
--- a/ACE/ace/os_include/os_wordexp.h
+++ b/ACE/ace/os_include/os_wordexp.h
@@ -24,9 +24,7 @@
 
 #include "ace/os_include/os_stddef.h" // size_t
 
-#if !defined (ACE_LACKS_WORDEXP_H)
-#  include /**/ <wordexp.h>
-#endif /* !ACE_LACKS_WORDEXP_H */
+#include /**/ <wordexp.h>
 
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_WORDEXP_H */
diff --git a/ACE/ace/post.h b/ACE/ace/post.h
index 03741323f39..72d8917adb8 100644
--- a/ACE/ace/post.h
+++ b/ACE/ace/post.h
@@ -15,9 +15,6 @@
 # pragma pack (pop)
 #elif defined (__BORLANDC__)
 # pragma option pop
-# if (__BORLANDC__ <= 0x750)
-#  pragma option pop
-# endif
 # pragma nopushoptwarn
 # pragma nopackwarning
 #endif
diff --git a/ACE/ace/pre.h b/ACE/ace/pre.h
index 1c2004c7784..6ffc9362272 100644
--- a/ACE/ace/pre.h
+++ b/ACE/ace/pre.h
@@ -17,11 +17,6 @@
 # pragma pack (push, 8)
 #elif defined (__BORLANDC__)
 # pragma option push -a8 -b -Ve- -Vx- -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl -w-sig
-# if (__BORLANDC__ <= 0x750)
-// False warning: Function defined with different linkage, reported to
-// Embarcadero as QC 117740
-#  pragma option push -w-8127
-# endif
 # pragma nopushoptwarn
 # pragma nopackwarning
 #endif