All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] MSVC: Compile fix by not including sys/resources.h
@ 2011-10-21 19:36 Vincent van Ravesteijn
  2011-10-21 19:39 ` [PATCH 2/3] MSVC: Compile fix by including io.h Vincent van Ravesteijn
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Vincent van Ravesteijn @ 2011-10-21 19:36 UTC (permalink / raw)
  To: git

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCHv2] Compile fix for MSVC
@ 2011-10-31 19:12 Vincent van Ravesteijn
  2011-10-31 19:12 ` [PATCH 3/3] MSVC: Remove unneeded header stubs Vincent van Ravesteijn
  0 siblings, 1 reply; 5+ messages in thread
From: Vincent van Ravesteijn @ 2011-10-31 19:12 UTC (permalink / raw)
  To: git; +Cc: kusmabite, ramsay, msysgit, gitster

This is a re-roll of the patch series sent to the list 
on 21-10-2011.

This time the lines are not wrapped and the commit messages
are updated with changes from me and Junio.

[PATCH 1/3] Compile fix for MSVC: Do not include sys/resources.h
[PATCH 2/3] Compile fix for MSVC: Include <io.h>
[PATCH 3/3] MSVC: Remove unneeded header stubs

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-10-31 19:13 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-21 19:36 [PATCH 1/3] MSVC: Compile fix by not including sys/resources.h Vincent van Ravesteijn
2011-10-21 19:39 ` [PATCH 2/3] MSVC: Compile fix by including io.h Vincent van Ravesteijn
2011-10-21 19:42 ` [PATCH 3/3] MSVC: Remove unneeded header stubs Vincent van Ravesteijn
2011-10-22  0:56 ` [PATCH 1/3] MSVC: Compile fix by not including sys/resources.h Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2011-10-31 19:12 [PATCHv2] Compile fix for MSVC Vincent van Ravesteijn
2011-10-31 19:12 ` [PATCH 3/3] MSVC: Remove unneeded header stubs Vincent van Ravesteijn

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.