diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-03-20 13:11:49 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 13:11:49 -0700 |
commit | 551fc7aec1a7efe868a59fbeea14582b41923f4d (patch) | |
tree | d61c1f84583a496e2a4276c840fe4a8b867f9487 /git-compat-util.h | |
parent | ec0465ade87996214959a393239eec520daf92ea (diff) | |
parent | a25b5a32c76630f2433b860fef7bc28a9380a8f6 (diff) | |
download | git-551fc7aec1a7efe868a59fbeea14582b41923f4d.tar.gz |
Merge branch 'km/bsd-sysctl'
We now detect number of CPUs on older BSD-derived systems.
* km/bsd-sysctl:
thread-utils.c: detect CPU count on older BSD-like systems
configure: support HAVE_BSD_SYSCTL option
Diffstat (limited to 'git-compat-util.h')
-rw-r--r-- | git-compat-util.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index fbfd10dadc..bc8fc8cf85 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -127,6 +127,9 @@ #else #include <poll.h> #endif +#ifdef HAVE_BSD_SYSCTL +#include <sys/sysctl.h> +#endif #if defined(__MINGW32__) /* pull in Windows compatibility stuff */ |