diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-15 13:25:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-15 13:27:04 -0700 |
commit | ed44fd045a8a4bcf7f30a47e4fc6aba761faaf78 (patch) | |
tree | ccc8afe7eb85ec89347047f8e3fb5ff7f4c2f6a6 /thread-utils.c | |
parent | e0d48279d5a96bc02edac72c1d28fc38aed37c15 (diff) | |
parent | 4d8b32a2e1758236c4c1b714f179892e3bce982c (diff) | |
download | git-ed44fd045a8a4bcf7f30a47e4fc6aba761faaf78.tar.gz git-ed44fd045a8a4bcf7f30a47e4fc6aba761faaf78.tar.xz |
Merge v1.7.5-rc2 into jn/format-patch-doc
This is to sync with the recent updates in Documentation/SubmittingPatches
and Documentation/format-patch.txt
Diffstat (limited to 'thread-utils.c')
-rw-r--r-- | thread-utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/thread-utils.c b/thread-utils.c index 589f838f8..7f4b76a95 100644 --- a/thread-utils.c +++ b/thread-utils.c @@ -1,5 +1,5 @@ #include "cache.h" -#include <pthread.h> +#include "thread-utils.h" #if defined(hpux) || defined(__hpux) || defined(_hpux) # include <sys/pstat.h> |