Merge branch 'nd/setup'

diff --git a/builtin/grep.c b/builtin/grep.c
index adb542494dde32123011b1e76ed164ab39e6e716..fdf7131efd25618250f382dff178ca38f9b42c77 100644 (file)
--- 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>...]",