diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-16 16:21:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-16 16:21:06 -0700 |
| commit | 5c1eba5e312838774afe44bb52885f3cd7e4ac7a (patch) | |
| tree | dccf68a10a7a8666720202bcc9ece2ef3138a2b1 /builtin/grep.c | |
| parent | 419ff2c575b96555dedac8c736025acfca9f982f (diff) | |
| parent | 937491944292fa3303b565b9bd8914c6b644ab13 (diff) | |
| download | git-5c1eba5e312838774afe44bb52885f3cd7e4ac7a.tar.gz | |
Merge branch 'np/malloc-threading' into maint
* 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.c | 2 |
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[] = { |