From 466931d9e10017aca5548f23e3efbcb3063d3c34 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 14 Jan 2016 17:52:02 +0100 Subject: compat/winansi: support compiling with MSys2 MSys2 already defines the _CONSOLE_FONT_INFOEX structure. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- compat/winansi.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'compat') diff --git a/compat/winansi.c b/compat/winansi.c index ceff55bd67..3aa5535f5d 100644 --- a/compat/winansi.c +++ b/compat/winansi.c @@ -23,6 +23,7 @@ static HANDLE hthread, hread, hwrite; static HANDLE hconsole1, hconsole2; #ifdef __MINGW32__ +#if !defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 5 typedef struct _CONSOLE_FONT_INFOEX { ULONG cbSize; DWORD nFont; @@ -32,6 +33,7 @@ typedef struct _CONSOLE_FONT_INFOEX { WCHAR FaceName[LF_FACESIZE]; } CONSOLE_FONT_INFOEX, *PCONSOLE_FONT_INFOEX; #endif +#endif typedef BOOL (WINAPI *PGETCURRENTCONSOLEFONTEX)(HANDLE, BOOL, PCONSOLE_FONT_INFOEX); -- cgit v1.2.3