From: Vincent van Ravesteijn <vfr@lyx.org>
To: git@vger.kernel.org
Subject: [PATCH 1/3] MSVC: Compile fix by not including sys/resources.h
Date: Fri, 21 Oct 2011 21:36:41 +0200 [thread overview]
Message-ID: <4EA1C9C9.9010904@lyx.org> (raw)
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
next reply other threads:[~2011-10-21 19:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-21 19:36 Vincent van Ravesteijn [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EA1C9C9.9010904@lyx.org \
--to=vfr@lyx.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.