projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
c++: fix -Wenum-in-bool-context
[awesomized/libmemcached]
/
libtest
/
cpu.cc
diff --git
a/libtest/cpu.cc
b/libtest/cpu.cc
index 4643e56d25e2a2146d965dcee36a82aac70bbb27..c62d6c25e0fc6ddb052cfd0310433682dc421d56 100644
(file)
--- a/
libtest/cpu.cc
+++ b/
libtest/cpu.cc
@@
-34,14
+34,16
@@
*
*/
*
*/
-#include
<config.h>
+#include
"libtest/yatlcon.h"
#include <libtest/common.h>
#include <unistd.h>
#pragma GCC diagnostic ignored "-Wundef"
#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
#include <sys/sysctl.h>
#endif
@@
-50,7
+52,7
@@
namespace libtest {
size_t number_of_cpus()
{
size_t number_of_cpu= 1;
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];
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];