compat/winansi: support compiling with MSys2
MSys2 already defines the _CONSOLE_FONT_INFOEX structure. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jan 14, 2016 at 17:52 UTC
466931d9e10017aca5548f23e3efbcb3063d3c34
1 file changed
+2
compat/winansi.c
+2
@@ -23,6 +23,7 @@ static HANDLE hthread, hread, hwrite;
23
static HANDLE hconsole1, hconsole2;
24
25
#ifdef __MINGW32__
26
+#if !defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 5
27
typedef struct _CONSOLE_FONT_INFOEX {
28
ULONG cbSize;
29
DWORD nFont;
@@ -32,6 +33,7 @@ typedef struct _CONSOLE_FONT_INFOEX {
33
WCHAR FaceName[LF_FACESIZE];
34
} CONSOLE_FONT_INFOEX, *PCONSOLE_FONT_INFOEX;
35
#endif
36
+#endif
37
38
typedef BOOL (WINAPI *PGETCURRENTCONSOLEFONTEX)(HANDLE, BOOL,
39
PCONSOLE_FONT_INFOEX);