diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 11:02:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 11:02:16 (GMT) |
| commit | ea5f75a64ae52590b06713d45d84de03ca109ccc (patch) | |
| tree | 3d7e604cb897afd9b8bcf7ed413e86d193cab40a /builtin/grep.c | |
| parent | af655431f53c20e3d0ed236544397c69974267f4 (diff) | |
| parent | 937491944292fa3303b565b9bd8914c6b644ab13 (diff) | |
| download | git-ea5f75a64ae52590b06713d45d84de03ca109ccc.zip git-ea5f75a64ae52590b06713d45d84de03ca109ccc.tar.gz git-ea5f75a64ae52590b06713d45d84de03ca109ccc.tar.bz2 | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 8e928e2..b194ea3 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[] = { |