From dad285f2c4e0ed6b6f568539cd7b1a07412542bf Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 15 Jun 2020 19:47:36 +0200
Subject: sys/sysctl.h got deprecated in glibc 2.30, removed in kernel 5.5, so
 updated version check to use glibc

    * ACE/ace/config-linux-common.h:
---
 ACE/ace/config-linux-common.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index 6f0a560002e..06b9e3587f7 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -45,6 +45,10 @@
 #  define ACE_HAS_GLIBC_2_2_3
 #endif /* __GLIBC__ > 2 || __GLIBC__ === 2 && __GLIBC_MINOR__ >= 3) */
 
+#if (__GLIBC__  > 2)  || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 30)
+#  define ACE_LACKS_SYS_SYSCTL_H
+#endif /* __GLIBC__ > 2 || __GLIBC__ === 2 && __GLIBC_MINOR__ >= 30) */
+
 #if defined (__INTEL_COMPILER)
 #  include "ace/config-icc-common.h"
 #elif defined (__GNUG__)
@@ -252,8 +256,4 @@
 #  define ACE_HAS_GETTID // See ACE_OS::thr_gettid()
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION (5,5,0))
-#  define ACE_LACKS_SYS_SYSCTL_H
-#endif
-
 #endif /* ACE_CONFIG_LINUX_COMMON_H */
-- 
cgit v1.2.1


From f18c85a3c30f519f7f26689ac5a144ac427b5446 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 15 Jun 2020 19:47:51 +0200
Subject: Doxygen change

    * ACE/ace/Functor_T.h:
---
 ACE/ace/Functor_T.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ACE/ace/Functor_T.h b/ACE/ace/Functor_T.h
index 33b955ae9c5..f89b683d567 100644
--- a/ACE/ace/Functor_T.h
+++ b/ACE/ace/Functor_T.h
@@ -91,7 +91,7 @@ class ACE_Member_Function_Command : public ACE_Command_Base
 public:
   typedef void (RECEIVER::*PTMF)(void);
 
-  /// Con Constructor: sets the <receiver_> of the Command to recvr, and the
+  /// Con Constructor: sets the <receiver_> of the Command to @a recvr, and the
   /// <action_> of the Command to <action>.
   ACE_Member_Function_Command (RECEIVER &recvr, PTMF ptmf);
 
-- 
cgit v1.2.1


From ef7fc87642a65e385ca9819e7550b708e0a68bb1 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 15 Jun 2020 19:47:59 +0200
Subject: Layout change

    * ACE/ace/Get_Opt.h:
---
 ACE/ace/Get_Opt.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ACE/ace/Get_Opt.h b/ACE/ace/Get_Opt.h
index 47aa82720ac..fbe64a18a3b 100644
--- a/ACE/ace/Get_Opt.h
+++ b/ACE/ace/Get_Opt.h
@@ -38,7 +38,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * This is a C++ wrapper for getopt(3c) and getopt_long(3c).
  */
-
 class ACE_Export ACE_Get_Opt
 {
 public:
-- 
cgit v1.2.1