[PATCH 1/3] MSVC: Compile fix by not including sys/resources.h

From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Oct 21, 2011, 19:36 UTC
Message-ID: <4EA1C9C9.9010904@lyx.org>

Fix compilation when compiling with MSVC because sys/resource.h is not available. This patch causes a number of other headerfiles that are not available to be excluded as well.

Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
---
  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
--
1.7.6.msysgit.0