From 41c7e01ec738a4b05bfb217485b73ce83f359a4b Mon Sep 17 00:00:00 2001 From: Evan Miller Date: Wed, 5 Aug 2020 08:41:33 -0400 Subject: [PATCH] Even more Windows fixes --- include/mdbfakeglib.h | 4 ++++ src/libmdb/fakeglib.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/mdbfakeglib.h b/include/mdbfakeglib.h index 663a76b..73541d6 100644 --- a/include/mdbfakeglib.h +++ b/include/mdbfakeglib.h @@ -96,7 +96,11 @@ typedef struct GOptionContext { #define g_free free #define g_realloc realloc +#ifdef _WIN32 +#define g_strdup _strdup +#else #define g_strdup strdup +#endif #define G_STR_DELIMITERS "_-|> <." diff --git a/src/libmdb/fakeglib.c b/src/libmdb/fakeglib.c index a0569d9..da884a5 100644 --- a/src/libmdb/fakeglib.c +++ b/src/libmdb/fakeglib.c @@ -92,7 +92,7 @@ int vasprintf(char **ret, const char *format, va_list ap) { return -1; if ((result = malloc(len+1)) == NULL) return -1; - if ((retval = _vsprintf_s(result, len+1, format, ap)) == -1) { + if ((retval = vsprintf_s(result, len+1, format, ap)) == -1) { free(result); return -1; }