[PATCH 1/2] simplify inclusion of pthread.h
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Dec 10, 2010, 19:47 UTC
- Message-ID
- <20101210194754.GB6801@burratino>
- In-Reply-To
- <20101210194637.GA6801@burratino>
In v1.7.1.1~56^2 (Thread-safe xmalloc and xrealloc needs a recursive mutex, 2010-04-08), the thread-utils header started using pthread_mutex_t, so callers, which generally had been using
#ifndef NO_PTHREADS #include "thread-utils.h" #include <pthread.h> #endif
before, were changed to include <pthread.h> first. It is simpler to let thread-utils.h take care of the whole matter. This way, we can later add more things that the threaded part of the system would need to thread-utils.h inside "ifndef NO_PTHREADS" and they will automatically get included by all headers.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- builtin/grep.c | 4 ---- builtin/pack-objects.c | 4 ---- thread-utils.h | 4 ++++ transport-helper.c | 4 ---- 4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c index adb5424..fdf7131 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -17,11 +17,7 @@ #include "grep.h" #include "quote.h" #include "dir.h" - -#ifndef NO_PTHREADS -#include <pthread.h> #include "thread-utils.h" -#endif static char const * const grep_usage[] = { "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]", diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index f027b3a..b0503b2 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -16,11 +16,7 @@ #include "list-objects.h" #include "progress.h" #include "refs.h" - -#ifndef NO_PTHREADS -#include <pthread.h> #include "thread-utils.h" -#endif static const char pack_usage[] = "git pack-objects [ -q | --progress | --all-progress ]\n" diff --git a/thread-utils.h b/thread-utils.h index 1727a03..6fb98c3 100644 --- a/thread-utils.h +++ b/thread-utils.h @@ -1,7 +1,11 @@ #ifndef THREAD_COMPAT_H #define THREAD_COMPAT_H +#ifndef NO_PTHREADS +#include <pthread.h> + extern int online_cpus(void); extern int init_recursive_mutex(pthread_mutex_t*); +#endif #endif /* THREAD_COMPAT_H */ diff --git a/transport-helper.c b/transport-helper.c index 3a50856..4e4754c 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -8,11 +8,7 @@ #include "quote.h" #include "remote.h" #include "string-list.h" - -#ifndef NO_PTHREADS -#include <pthread.h> #include "thread-utils.h" -#endif static int debug;
-- 1.7.2.4