From cfc755d30e2f9d92f19af10ba2d810281aa94c99 Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Mon, 31 Oct 2011 20:12:42 +0100 Subject: Compile fix for MSVC: Do not include sys/resources.h Do not include header files when compiling with MSVC that do not exist and which are also not included when compiling with MINGW. A direct consequence is that git can be compiled again with MSVC because the missing "sys/resources.h" is no longer included. Instead of current #ifndef mingw32 is the only one that is strange ... everything for systems that is not strange ... #else ... include mingw specific tweaks ... #endif #ifdef msvc is also strange ... include msvc specific tweaks ... #endif it turns things around and says what it wants to achieve in a more direct way, i.e. #if mingw32 #include "compat/mingw.h" #elif msvc #include "compat/msvc.h" #else ... all the others ... #endif which makes it a lot simpler. Signed-off-by: Vincent van Ravesteijn Helped-by: Junio C Hamano Acked-by: Erik Faye-Lund Signed-off-by: Junio C Hamano --- git-compat-util.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'git-compat-util.h') diff --git a/git-compat-util.h b/git-compat-util.h index 5ef8ff76f..53186dacb 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 @@ -145,12 +150,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 -- cgit v1.2.1