[PATCH 09/14] Avoid including windows.h in winansi.c for MSVC build
- From
Marius Storm-Olsen <mstormo@gmail.com>
- Date
- Aug 21, 2009, 13:30 UTC
- Message-ID
- <74ca14c3a691cc9844a0dd806f5db47977317bdb.1250860247.git.mstormo@gmail.com>
- In-Reply-To
- <1e623b19b2df001919c83418fef89ef04d7b8dfe.1250860247.git.mstormo@gmail.com>
From: Frank Li <lznuaa@gmail.com>
compat/msvc.h includes winsock2.h which conflicts with windows.h. msvc.h also defines the oldest Windows API version required.
Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> --- compat/winansi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/compat/winansi.c b/compat/winansi.c index 9217c24..0d79845 100644 --- a/compat/winansi.c +++ b/compat/winansi.c @@ -2,7 +2,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.3.msysgit.0.18.gef407