Alexandre Julliard : expand: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Mon Apr 29 16:08:49 CDT 2019
Module: wine
Branch: master
Commit: b5e2f767b6834f6e7daeeab298e29fcbc6d0c763
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5e2f767b6834f6e7daeeab298e29fcbc6d0c763
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Apr 29 10:47:01 2019 +0200
expand: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/expand/Makefile.in | 3 ++-
programs/expand/expand.c | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/programs/expand/Makefile.in b/programs/expand/Makefile.in
index 0e83e63..b6dd16b 100644
--- a/programs/expand/Makefile.in
+++ b/programs/expand/Makefile.in
@@ -1,5 +1,6 @@
MODULE = expand.exe
-APPMODE = -mconsole
IMPORTS = setupapi
+EXTRADLLFLAGS = -mconsole -mno-cygwin
+
C_SRCS = expand.c
diff --git a/programs/expand/expand.c b/programs/expand/expand.c
index ea7bfdf..cf7eb20 100644
--- a/programs/expand/expand.c
+++ b/programs/expand/expand.c
@@ -26,18 +26,18 @@
#include <lzexpand.h>
#include <setupapi.h>
-static int myprintf(const char* format, ...)
+static int WINAPIV myprintf(const char* format, ...)
{
- va_list va;
+ __ms_va_list va;
char tmp[8192];
DWORD w = 0;
int len;
- va_start(va, format);
+ __ms_va_start(va, format);
len = vsnprintf(tmp, sizeof(tmp), format, va);
if (len > 0)
WriteFile(GetStdHandle(STD_ERROR_HANDLE), tmp, len, &w, NULL);
- va_end(va);
+ __ms_va_end(va);
return w;
}
More information about the wine-cvs
mailing list