X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-compat-util.h;h=8f3972cd3295665b8b1f69b5db7aff67c8c61613;hb=69204d0ab18d28d07ee2c8c9b50bbf5bd80343ab;hp=230e198fc35390fbccb496d2b74425382439dc4a;hpb=79587741cbed7704d2e7213c999cf2841af3000d;p=git.git diff --git a/git-compat-util.h b/git-compat-util.h index 230e198fc..8f3972cd3 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -116,7 +116,12 @@ #else #include #endif -#ifndef __MINGW32__ +#if defined(__MINGW32__) +/* pull in Windows compatibility stuff */ +#include "compat/mingw.h" +#elif defined(_MSC_VER) +#include "compat/msvc.h" +#else #include #include #include @@ -130,6 +135,7 @@ #include #include #include +#include #ifndef NO_INTTYPES_H #include #else @@ -145,12 +151,6 @@ #include #define _ALL_SOURCE 1 #endif -#else /* __MINGW32__ */ -/* pull in Windows compatibility stuff */ -#include "compat/mingw.h" -#endif /* __MINGW32__ */ -#ifdef _MSC_VER -#include "compat/msvc.h" #endif #ifndef NO_LIBGEN_H