diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-06-15 15:08:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 15:08:59 +0200 |
| commit | da62ecad417a518c4540e6a488dacc55511f670c (patch) | |
| tree | 5c5b1de8e455fc296f233567ed9e2e04190971ae | |
| parent | 6903c62313a4160d09d91999f6f424f3925dfa11 (diff) | |
| parent | efac498d689122d0e6246cfe48dd85d0541f5ff4 (diff) | |
| download | ATCD-da62ecad417a518c4540e6a488dacc55511f670c.tar.gz | |
Merge pull request #1142 from jwillemsen/jwi-sysctl
Only include os_sysctl.h when ACE_HAS_SYSCTL has been defined and wit…
| -rw-r--r-- | ACE/ace/OS_NS_unistd.cpp | 4 | ||||
| -rw-r--r-- | ACE/ace/config-linux-common.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index f316b888c51..563e385fffd 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -13,7 +13,9 @@ #include "ace/Object_Manager_Base.h" #include "ace/Auto_Ptr.h" #include "ace/os_include/sys/os_pstat.h" -#include "ace/os_include/sys/os_sysctl.h" +#if defined (ACE_HAS_SYSCTL) +# include "ace/os_include/sys/os_sysctl.h" +#endif /* ACE_HAS_SYSCTL */ #if defined ACE_HAS_VXCPULIB # include "vxCpuLib.h" diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index c0fb656c321..6f0a560002e 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -252,4 +252,8 @@ # 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 */ |