[PATCH 09/12] Don't include windows.h at winansi.c at MSVC build

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



msvc.h include winsock2.h, which conflict windows.h.
msvc.h define minimized  required windows version

Signed-off-by: Frank Li <lznuaa@xxxxxxxxx>
---
 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@xxxxxxxxxxxxxxxxxxx>
  */
-
+#ifndef _MSC_VER
 #include <windows.h>
+#endif
 #include "../git-compat-util.h"
 
 /*
-- 
1.6.4.msysgit.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]