From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Mar 2015 20:11:49 +0000 (-0700)
Subject: Merge branch 'km/bsd-sysctl'
X-Git-Tag: v2.4.0-rc0~34
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/551fc7aec1a7efe868a59fbeea14582b41923f4d

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
---

551fc7aec1a7efe868a59fbeea14582b41923f4d
diff --cc Makefile
index 44f1dd10ff,fdac1b9803..5f3987fe3b
--- a/Makefile
+++ b/Makefile
@@@ -349,14 -349,7 +349,16 @@@ all:
  # Define NO_HMAC_CTX_CLEANUP if your OpenSSL is version 0.9.6b or earlier to
  # cleanup the HMAC context with the older HMAC_cleanup function.
  #
 +# Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
 +# compiles the following initialization:
 +#
 +#   static const char s[] = ("FOO");
 +#
 +# and define it to "no" if you need to remove the parentheses () around the
 +# constant.  The default is "auto", which means to use parentheses if your
 +# compiler is detected to support it.
++#
+ # Define HAVE_BSD_SYSCTL if your platform has a BSD-compatible sysctl function.
  
  GIT-VERSION-FILE: FORCE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN