From: Karsten Blees <karsten.blees@gmail.com>
To: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 2/3] MSVC: fix compile errors due to macro redefinitions
Date: Wed, 11 Sep 2013 01:22:34 +0200 [thread overview]
Message-ID: <522FA9BA.6020303@gmail.com> (raw)
In-Reply-To: <522FA959.80108@gmail.com>
Skip errno.h definitions if they are already defined.
Signed-off-by: Karsten Blees <blees@dcon.de>
---
compat/mingw.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/compat/mingw.h b/compat/mingw.h
index bd0a88b..6b531e4 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -32,7 +32,9 @@ typedef int socklen_t;
#define WEXITSTATUS(x) ((x) & 0xff)
#define WTERMSIG(x) SIGTERM
+#ifndef EWOULDBLOCK
#define EWOULDBLOCK EAGAIN
+#endif
#define SHUT_WR SD_SEND
#define SIGHUP 1
@@ -46,8 +48,12 @@ typedef int socklen_t;
#define F_SETFD 2
#define FD_CLOEXEC 0x1
+#ifndef EAFNOSUPPORT
#define EAFNOSUPPORT WSAEAFNOSUPPORT
+#endif
+#ifndef ECONNABORTED
#define ECONNABORTED WSAECONNABORTED
+#endif
struct passwd {
char *pw_name;
--
1.8.4.8243.gbcbdefd
next prev parent reply other threads:[~2013-09-10 23:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-10 23:20 [PATCH 0/3] Fix MSVC compile errors and cleanup stat definitions Karsten Blees
2013-09-10 23:21 ` [PATCH 1/3] MSVC: fix compile errors due to missing libintl.h Karsten Blees
2013-09-10 23:22 ` Karsten Blees [this message]
2013-09-10 23:23 ` [PATCH 3/3] MSVC: fix stat definition hell Karsten Blees
2013-09-11 0:35 ` Eric Sunshine
2013-09-11 16:02 ` Sebastian Schuberth
2013-09-11 16:09 ` [PATCH 0/3] Fix MSVC compile errors and cleanup stat definitions Junio C Hamano
2013-09-11 16:16 ` Sebastian Schuberth
2013-09-11 18:11 ` 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=522FA9BA.6020303@gmail.com \
--to=karsten.blees@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.