summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-10 10:32:12 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-10 12:58:06 -0800
commitb361888dd5a26c4f1eb6268392e89e2d546accf6 (patch)
treed2c62bda2a95eaea7871c0c645f54d8d45734915 /builtin
parentMakefile: transport-helper uses thread-utils.h (diff)
downloadtgif-b361888dd5a26c4f1eb6268392e89e2d546accf6.tar.xz
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>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/grep.c4
-rw-r--r--builtin/pack-objects.c4
2 files changed, 0 insertions, 8 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"