aboutsummaryrefslogtreecommitdiff
path: root/compat/winansi.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-01-12 15:11:41 -0800
committerJunio C Hamano <gitster@pobox.com>2022-01-12 15:11:41 -0800
commita4510f8106a65f42d4ecbe9b826f16e4ff9df6db (patch)
tree2c46633005363bc26b15aefd8648d052a2c97478 /compat/winansi.c
parentcde28af37b19e07139ebb6a355d742e763b7a235 (diff)
parent4a9b204920152c668228a9d43a63be39b0c32f45 (diff)
downloadgit-a4510f8106a65f42d4ecbe9b826f16e4ff9df6db.tar.xz
Merge branch 'ma/windows-dynload-fix'
Fix calling dynamically loaded functions on Windows. * ma/windows-dynload-fix: lazyload: use correct calling conventions
Diffstat (limited to 'compat/winansi.c')
-rw-r--r--compat/winansi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/compat/winansi.c b/compat/winansi.c
index c27b20a79d..4fceecf14c 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -45,8 +45,9 @@ typedef struct _CONSOLE_FONT_INFOEX {
static void warn_if_raster_font(void)
{
DWORD fontFamily = 0;
- DECLARE_PROC_ADDR(kernel32.dll, BOOL, GetCurrentConsoleFontEx,
- HANDLE, BOOL, PCONSOLE_FONT_INFOEX);
+ DECLARE_PROC_ADDR(kernel32.dll, BOOL, WINAPI,
+ GetCurrentConsoleFontEx, HANDLE, BOOL,
+ PCONSOLE_FONT_INFOEX);
/* don't bother if output was ascii only */
if (!non_ascii_used)