summaryrefslogtreecommitdiff
path: root/builtin/grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-21 04:02:16 -0700
committerJunio C Hamano <gitster@pobox.com>2010-05-21 04:02:16 -0700
commitea5f75a64ae52590b06713d45d84de03ca109ccc (patch)
tree3d7e604cb897afd9b8bcf7ed413e86d193cab40a /builtin/grep.c
parentaf655431f53c20e3d0ed236544397c69974267f4 (diff)
parent937491944292fa3303b565b9bd8914c6b644ab13 (diff)
downloadgit-ea5f75a64ae52590b06713d45d84de03ca109ccc.tar.gz
Merge branch 'np/malloc-threading'
* np/malloc-threading: Thread-safe xmalloc and xrealloc needs a recursive mutex Make xmalloc and xrealloc thread-safe
Diffstat (limited to 'builtin/grep.c')
-rw-r--r--builtin/grep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c
index 8e928e2170..b194ea3cea 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -17,8 +17,8 @@
#include "dir.h"
#ifndef NO_PTHREADS
-#include "thread-utils.h"
#include <pthread.h>
+#include "thread-utils.h"
#endif
static char const * const grep_usage[] = {