diff options
| author | Carlos Martín Nieto <cmn@elego.de> | 2011-03-31 15:29:13 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@elego.de> | 2011-03-31 15:29:13 +0200 |
| commit | f026f2b9ee5f0aeced5c366c890c4a29eee2a1c7 (patch) | |
| tree | c26b59992df7ebe645cb9485a4eb70c41e127816 /src/common.h | |
| parent | 11d0e70578baf47fb1cb565e0336e18d417e5da6 (diff) | |
| parent | a796d24cf697b0b51aa0ca7ef887e980f0d9fb7a (diff) | |
| download | libgit2-f026f2b9ee5f0aeced5c366c890c4a29eee2a1c7.tar.gz | |
Merge upstream/development
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Diffstat (limited to 'src/common.h')
| -rw-r--r-- | src/common.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/common.h b/src/common.h index 1ca00471b..5ad878e26 100644 --- a/src/common.h +++ b/src/common.h @@ -11,9 +11,6 @@ #include "git2/thread-utils.h" #include "cc-compat.h" -#ifdef GIT_HAS_PTHREAD -# include <pthread.h> -#endif #ifdef GIT_HAVE_INTTYPES_H # include <inttypes.h> #endif @@ -34,16 +31,21 @@ # include <windows.h> # include "msvc-compat.h" # include "mingw-compat.h" +# ifdef GIT_THREADS +# include "win32/pthread.h" +#endif # define snprintf _snprintf typedef SSIZE_T ssize_t; #else - # include <unistd.h> # include <arpa/inet.h> +# ifdef GIT_THREADS +# include <pthread.h> +# endif #endif #include "git2/common.h" |