libmemcached: fix #35 (handling of MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS)

[awesomized/libmemcached] / libtest / cpu.cc

diff --git a/libtest/cpu.cc b/libtest/cpu.cc
index 7b04042e2856483c0ef6cbf93c9e917156c5b8a8..c62d6c25e0fc6ddb052cfd0310433682dc421d56 100644 (file)
--- a/libtest/cpu.cc
+++ b/libtest/cpu.cc
@@ -34,12 +34,16 @@
  *
  */
 
-#include <config.h>
+#include "libtest/yatlcon.h"
 #include <libtest/common.h>
 
 #include <unistd.h>
 
-#if defined(HAVE_SYS_SYSCTL_H) && HAVE_SYS_SYSCTL_H
+#pragma GCC diagnostic ignored "-Wundef"
+
+#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
 
@@ -48,7 +52,7 @@ namespace libtest {
 size_t number_of_cpus()
 {
   size_t number_of_cpu= 1;
-#if 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];
@@ -72,7 +76,7 @@ size_t number_of_cpus()
     }
   }
 #else
-  fprintf(stderr, "Going with guessing\n");
+ // Guessing number of CPU
 #endif
 
   return number_of_cpu;