diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-06-15 21:00:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 21:00:46 +0200 |
| commit | ae6be536342fb0b1e19edd37882a00dbc38d0610 (patch) | |
| tree | 758d6734384df5f220a0931d6d0ee6e48e424ea7 | |
| parent | 9bfd3221d90cd917b7dea4c23761a00c71c3b052 (diff) | |
| parent | ef7fc87642a65e385ca9819e7550b708e0a68bb1 (diff) | |
| download | ATCD-ae6be536342fb0b1e19edd37882a00dbc38d0610.tar.gz | |
Merge pull request #1144 from jwillemsen/jwi-sysctl
sys/sysctl.h got deprecated in glibc 2.30, removed in kernel 5.5
| -rw-r--r-- | ACE/ace/Functor_T.h | 2 | ||||
| -rw-r--r-- | ACE/ace/Get_Opt.h | 1 | ||||
| -rw-r--r-- | ACE/ace/config-linux-common.h | 8 |
3 files changed, 5 insertions, 6 deletions
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); 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: 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 */ |