diff options
| author | Vincent van Ravesteijn <vfr@lyx.org> | 2011-10-31 19:12:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-01 03:05:57 (GMT) |
| commit | cfc755d30e2f9d92f19af10ba2d810281aa94c99 (patch) | |
| tree | 4c54bde67ed747def58a3532ab3ceea031bbb473 /git-compat-util.h | |
| parent | be3fa9125e708348c7baf04ebe9507a72a9d1800 (diff) | |
| download | git-cfc755d30e2f9d92f19af10ba2d810281aa94c99.zip git-cfc755d30e2f9d92f19af10ba2d810281aa94c99.tar.gz git-cfc755d30e2f9d92f19af10ba2d810281aa94c99.tar.bz2 | |
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 <vfr@lyx.org>
Helped-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 5ef8ff7..53186da 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -116,7 +116,12 @@ #else #include <poll.h> #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 <sys/wait.h> #include <sys/resource.h> #include <sys/socket.h> @@ -145,12 +150,6 @@ #include <grp.h> #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 |