Merge in updated yatl.

[m6w6/libmemcached] / libtest / cpu.cc

diff --git a/libtest/cpu.cc b/libtest/cpu.cc
index bfbf5ced9e2770c298d30f963f0ffd0f5dee6526..838804d7fc3a29b10de248deaaca0fe75ce390bc 100644 (file)
--- a/libtest/cpu.cc
+++ b/libtest/cpu.cc
@@ -34,11 +34,13 @@
  *
  */
 
-#include <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
 #include <sys/sysctl.h>
 #endif
@@ -48,7 +50,7 @@ namespace libtest {
 size_t number_of_cpus()
 {
   size_t number_of_cpu= 1;
-#if TARGET_OS_LINUX
+#if defined(TARGET_OS_LINUX) && TARGET_OS_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];