diff options
| author | joshaber <joshaber@gmail.com> | 2015-07-22 11:33:18 -0400 |
|---|---|---|
| committer | joshaber <joshaber@gmail.com> | 2015-07-22 11:33:18 -0400 |
| commit | 9830fbba05ef66325f929a09407abc45ab85847d (patch) | |
| tree | dac363428f4705a632719e03b8b77f2d32ce2bb3 /src/thread-utils.c | |
| parent | cf198fdf2a044d2e2f0675c2c6b1cd9cdbcf4fcf (diff) | |
| parent | 42156d561723e92ffe597885719aa63abfe0795c (diff) | |
| download | libgit2-fix-init-ordering.tar.gz | |
Merge branch 'master' into fix-init-orderingfix-init-ordering
Diffstat (limited to 'src/thread-utils.c')
| -rw-r--r-- | src/thread-utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/thread-utils.c b/src/thread-utils.c index c3baf411a..dc9b2f09e 100644 --- a/src/thread-utils.c +++ b/src/thread-utils.c @@ -8,7 +8,9 @@ #include "thread-utils.h" #ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN +#endif # include <windows.h> #elif defined(hpux) || defined(__hpux) || defined(_hpux) # include <sys/pstat.h> |