diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-10 21:32:12 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-10 23:58:06 +0300 |
| commit | b361888dd5a26c4f1eb6268392e89e2d546accf6 (patch) | |
| tree | d2c62bda2a95eaea7871c0c645f54d8d45734915 | |
| parent | e4117b1fe8fa17f54ea30997255299ba5650f445 (diff) | |
thread-utils.h: simplify the inclusion
All files that include this header file use the same four line
incantation:
#ifndef NO_PTHREADS
#include <pthread.h>
#include "thread-utils.h"
#endif
Move the responsibility for that gymnastics to the header file from the
files that include it. This approach makes it easier to later declare new
services that are related to threading in thread-utils.h and have them
available to all the threading code.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/grep.c | 4 | ||||
| -rw-r--r-- | builtin/pack-objects.c | 4 | ||||
| -rw-r--r-- | thread-utils.h | 4 | ||||
| -rw-r--r-- | transport-helper.c | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index adb542494d..fdf7131efd 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 f027b3abb4..b0503b202a 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 1727a03333..6fb98c333c 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 3a50856318..4e4754c32b 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; |