From 0c45d258ec35c1ef51523dd45e4518bd8a09258c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 13 Oct 2014 12:46:14 -0700 Subject: pack-objects: set number of threads before checking and warning Under NO_PTHREADS build, we warn when delta_search_threads is not set to 1, because that is the only sensible value on a single threaded build. However, the auto detection that kicks in when that variable is set to 0 (e.g. there is no configuration variable or command line option, or an explicit --threads=0 is given from the command line to override the pack.threads configuration to force auto-detection) was not done before the condition to issue this warning was tested. Move the auto-detection code and place it at an appropriate spot. Signed-off-by: Junio C Hamano --- thread-utils.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'thread-utils.h') diff --git a/thread-utils.h b/thread-utils.h index 6fb98c333..d9a769d19 100644 --- a/thread-utils.h +++ b/thread-utils.h @@ -7,5 +7,9 @@ extern int online_cpus(void); extern int init_recursive_mutex(pthread_mutex_t*); +#else + +#define online_cpus() 1 + #endif #endif /* THREAD_COMPAT_H */ -- cgit v1.2.1