summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-01-14 17:52:02 +0100
committerJunio C Hamano <gitster@pobox.com>2016-01-14 12:21:00 -0800
commit466931d9e10017aca5548f23e3efbcb3063d3c34 (patch)
treeeabc1ea965b07376a1b622b45217b24e4875a652 /compat
parent3ecd153a3bdbefb25a4bf451d7b91cf8f1ece2a9 (diff)
downloadgit-466931d9e10017aca5548f23e3efbcb3063d3c34.tar.gz
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>
Diffstat (limited to 'compat')
-rw-r--r--compat/winansi.c2
1 files changed, 2 insertions, 0 deletions
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);