diff --git a/src/libpsl-native/src/CMakeLists.txt b/src/libpsl-native/src/CMakeLists.txt index 3b06458..4202c96 100644 --- a/src/libpsl-native/src/CMakeLists.txt +++ b/src/libpsl-native/src/CMakeLists.txt @@ -1,4 +1,5 @@ include(CheckIncludeFiles) +include(CheckFunctionExists) add_library(psl-native SHARED getstat.cpp @@ -28,8 +29,10 @@ add_library(psl-native SHARED createprocess.cpp nativesyslog.cpp) +check_function_exists(sysconf HAVE_SYSCONF) + check_include_files( - "sys/types.h;sys/sysctl.h" + "sys/sysctl.h" HAVE_SYS_SYSCTL_H) configure_file( diff --git a/src/libpsl-native/src/getppid.cpp b/src/libpsl-native/src/getppid.cpp index 7f64e28..1173aca 100644 --- a/src/libpsl-native/src/getppid.cpp +++ b/src/libpsl-native/src/getppid.cpp @@ -7,7 +7,9 @@ #include #include -#if HAVE_SYS_SYSCTL_H +#if HAVE_SYSCONF +// do nothing +#elif HAVE_SYS_SYSCTL_H #include #endif diff --git a/src/libpsl-native/src/getuserfrompid.cpp b/src/libpsl-native/src/getuserfrompid.cpp index e110ed2..e131ac9 100644 --- a/src/libpsl-native/src/getuserfrompid.cpp +++ b/src/libpsl-native/src/getuserfrompid.cpp @@ -11,7 +11,11 @@ #include #include -#if HAVE_SYS_SYSCTL_H +#if __APPLE__ +#include +#elif HAVE_SYSCONF +// do nothing +#elif HAVE_SYS_SYSCTL_H #include #endif diff --git a/src/libpsl-native/src/pal_config.h.in b/src/libpsl-native/src/pal_config.h.in index f1d702d..6118016 100644 --- a/src/libpsl-native/src/pal_config.h.in +++ b/src/libpsl-native/src/pal_config.h.in @@ -1,3 +1,4 @@ #pragma once #cmakedefine01 HAVE_SYS_SYSCTL_H +#cmakedefine01 HAVE_SYSCONF