summaryrefslogtreecommitdiff
path: root/deps/uv/src/unix/darwin.c
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2012-07-20 10:01:46 -0700
committerisaacs <i@izs.me>2012-07-20 11:08:36 -0700
commite16d506a58d46619c05b08f3f8ef4d5491b18b69 (patch)
tree82d73799208905b6d6d290704987dafde583c603 /deps/uv/src/unix/darwin.c
parent85185bbbaa9e99bd77232f529687e9fa5d26af78 (diff)
downloadandroid-node-v8-e16d506a58d46619c05b08f3f8ef4d5491b18b69.tar.gz
android-node-v8-e16d506a58d46619c05b08f3f8ef4d5491b18b69.tar.bz2
android-node-v8-e16d506a58d46619c05b08f3f8ef4d5491b18b69.zip
uv: Upgrade to ad382bca
Diffstat (limited to 'deps/uv/src/unix/darwin.c')
-rw-r--r--deps/uv/src/unix/darwin.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/deps/uv/src/unix/darwin.c b/deps/uv/src/unix/darwin.c
index e6deb3017b..cb45db0303 100644
--- a/deps/uv/src/unix/darwin.c
+++ b/deps/uv/src/unix/darwin.c
@@ -211,7 +211,8 @@ uv_err_t uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
uv_cpu_info_t* cpu_info;
size = sizeof(model);
- if (sysctlbyname("hw.model", &model, &size, NULL, 0) < 0) {
+ if (sysctlbyname("machdep.cpu.brand_string", &model, &size, NULL, 0) < 0 &&
+ sysctlbyname("hw.model", &model, &size, NULL, 0) < 0) {
return uv__new_sys_error(errno);
}
size = sizeof(cpuspeed);