X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcpu.cc;h=c62d6c25e0fc6ddb052cfd0310433682dc421d56;hb=7fa883aca713b99985cf35750ab0e2ffe6ce58e0;hp=a1844c5b41fa293957dd9980cf044779932fb614;hpb=23dca174eef8d846e3d4402729b57f6ded035e64;p=awesomized%2Flibmemcached

diff --git a/libtest/cpu.cc b/libtest/cpu.cc
index a1844c5b..c62d6c25 100644
--- a/libtest/cpu.cc
+++ b/libtest/cpu.cc
@@ -34,14 +34,16 @@
  *
  */
 
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
 #include <libtest/common.h>
 
 #include <unistd.h>
 
 #pragma GCC diagnostic ignored "-Wundef"
 
-#if defined(HAVE_SYS_SYSCTL_H) && HAVE_SYS_SYSCTL_H
+#if defined(HAVE_LINUX_SYSCTL_H) && HAVE_LINUX_SYSCTL_H
+#include <linux/sysctl.h>
+#elif defined(HAVE_SYS_SYSCTL_H) && HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>
 #endif
 
@@ -50,7 +52,7 @@ namespace libtest {
 size_t number_of_cpus()
 {
   size_t number_of_cpu= 1;
-#if defined(TARGET_OS_LINUX) && TARGET_OS_LINUX
+#if defined(__linux) && __linux
   number_of_cpu= sysconf(_SC_NPROCESSORS_ONLN);
 #elif defined(HAVE_SYS_SYSCTL_H) && defined(CTL_HW) && defined(HW_NCPU) && defined(HW_AVAILCPU) && defined(HW_NCPU)
   int mib[4];