From: Frank Li <lznuaa@gmail.com>
To: git@vger.kernel.org, msysgit@googlegroups.com
Cc: Frank Li <lznuaa@gmail.com>
Subject: [PATCH 09/12] Don't include windows.h at winansi.c at MSVC build
Date: Wed, 19 Aug 2009 23:52:44 +0800 [thread overview]
Message-ID: <1250697167-5536-9-git-send-email-lznuaa@gmail.com> (raw)
In-Reply-To: <1250697167-5536-8-git-send-email-lznuaa@gmail.com>
msvc.h include winsock2.h, which conflict windows.h.
msvc.h define minimized required windows version
Signed-off-by: Frank Li <lznuaa@gmail.com>
---
compat/winansi.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/compat/winansi.c b/compat/winansi.c
index 9217c24..15053d0 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -1,8 +1,9 @@
/*
* Copyright 2008 Peter Harris <git@peter.is-a-geek.org>
*/
-
+#ifndef _MSC_VER
#include <windows.h>
+#endif
#include "../git-compat-util.h"
/*
--
1.6.4.msysgit.0
next prev parent reply other threads:[~2009-08-19 15:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-19 15:52 [PATCH 01/12] Avoid declaration after instruction Frank Li
2009-08-19 15:52 ` [PATCH 02/12] Define SNPRINTF_SIZE_CORR=1 for Microsoft Visual C++ Frank Li
2009-08-19 15:52 ` [PATCH 03/12] Using macro WIN32 replace __MINGW32_ at Windows special handler The code which is conditional on MinGW32 is actually conditional on Windows. Use WIN32 macro will share both MINGW32 and MSVC environment Frank Li
2009-08-19 15:52 ` [PATCH 04/12] mingw.c: Use the O_BINARY flag to open files Frank Li
2009-08-19 15:52 ` [PATCH 05/12] Place __stdcall between return value and function name Frank Li
2009-08-19 15:52 ` [PATCH 06/12] Add _MSC_VER in porting head file git-compat-util.h Frank Li
2009-08-19 15:52 ` [PATCH 07/12] Add Unix header files to build git at MSVC Frank Li
2009-08-19 15:52 ` [PATCH 08/12] Add MSVC porting files Frank Li
2009-08-19 15:52 ` Frank Li [this message]
2009-08-19 15:52 ` [PATCH 10/12] Fix errcode have defined as int at MSVC Frank Li
2009-08-19 15:52 ` [PATCH 11/12] Add MSVC Project file Frank Li
2009-08-19 15:59 ` [PATCH 08/12] Add MSVC porting files Erik Faye-Lund
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=1250697167-5536-9-git-send-email-lznuaa@gmail.com \
--to=lznuaa@gmail.com \
--cc=git@vger.kernel.org \
--cc=msysgit@googlegroups.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).