aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2009-08-29 13:39:21 +0300
committerLasse Collin <lasse.collin@tukaani.org>2009-08-29 13:39:21 +0300
commit27414daadf5727e8ab942374b5ec1c8990122878 (patch)
treef0c214fa98ef24f296e288529e2aefb456a75794 /src/common
parentFix x86 assembler on GCC 3. (diff)
downloadxz-27414daadf5727e8ab942374b5ec1c8990122878.tar.xz
Fix sysctl() usage.
This fixes build on *BSDs and Darwin. Thanks to Jukka Salmi for the patches. Richard Koch reported the problem too.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/cpucores.h2
-rw-r--r--src/common/physmem.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/cpucores.h b/src/common/cpucores.h
index 704d8a26..330cd9c9 100644
--- a/src/common/cpucores.h
+++ b/src/common/cpucores.h
@@ -40,7 +40,7 @@ cpucores(void)
int name[2] = { CTL_HW, HW_NCPU };
int cpus;
size_t cpus_size = sizeof(cpus);
- if (!sysctl(name, &cpus, &cpus_size, NULL, NULL)
+ if (!sysctl(name, 2, &cpus, &cpus_size, NULL, 0)
&& cpus_size == sizeof(cpus) && cpus > 0)
ret = (uint32_t)(cpus);
#endif
diff --git a/src/common/physmem.h b/src/common/physmem.h
index 63482c6c..0dc77e97 100644
--- a/src/common/physmem.h
+++ b/src/common/physmem.h
@@ -104,7 +104,7 @@ physmem(void)
uint64_t u64;
} mem;
size_t mem_ptr_size = sizeof(mem.u64);
- if (!sysctl(name, 2, &mem.u64, &mem_ptr_size, NULL, NULL)) {
+ if (!sysctl(name, 2, &mem.u64, &mem_ptr_size, NULL, 0)) {
// IIRC, 64-bit "return value" is possible on some 64-bit
// BSD systems even with HW_PHYSMEM (instead of HW_PHYSMEM64),
// so support both.