X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcpu.cc;h=c62d6c25e0fc6ddb052cfd0310433682dc421d56;hb=2eae87612891b9cd1920c4afa8515b208e12958d;hp=4643e56d25e2a2146d965dcee36a82aac70bbb27;hpb=3893029e70c654f4fcf3bf8f8ba5b404afc6d446;p=awesomized%2Flibmemcached diff --git a/libtest/cpu.cc b/libtest/cpu.cc index 4643e56d..c62d6c25 100644 --- a/libtest/cpu.cc +++ b/libtest/cpu.cc @@ -34,14 +34,16 @@ * */ -#include +#include "libtest/yatlcon.h" #include #include #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 +#elif defined(HAVE_SYS_SYSCTL_H) && HAVE_SYS_SYSCTL_H #include #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];