From f1af742ecf8e4ee547de8531b36f46271d653ef5 Mon Sep 17 00:00:00 2001
From: Evan Miller <emmiller@gmail.com>
Date: Wed, 5 Aug 2020 09:22:26 -0400
Subject: [PATCH] Another attempted Cygwin fix

---
 include/mdbfakeglib.h | 2 +-
 src/libmdb/fakeglib.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/mdbfakeglib.h b/include/mdbfakeglib.h
index 185a10c..5a0262d 100644
--- a/include/mdbfakeglib.h
+++ b/include/mdbfakeglib.h
@@ -96,7 +96,7 @@ typedef struct GOptionContext {
 #define g_free free
 #define g_realloc realloc
 
-#if defined _WIN32 || defined __CYGWIN__
+#if defined _WIN32
 #define g_strdup _strdup
 #else
 #define g_strdup strdup
diff --git a/src/libmdb/fakeglib.c b/src/libmdb/fakeglib.c
index 143a07b..199308b 100644
--- a/src/libmdb/fakeglib.c
+++ b/src/libmdb/fakeglib.c
@@ -83,7 +83,7 @@ char *g_strconcat(const char *first, ...) {
     return ret;
 }
 
-#if defined _WIN32 || defined __CYGWIN__
+#if defined _WIN32
 int vasprintf(char **ret, const char *format, va_list ap) {
     int len;
     int retval;
@@ -106,7 +106,12 @@ char *g_strdup_printf(const char *format, ...) {
     va_list argp;
 
     va_start(argp, format);
+#ifdef ___CYGWIN__
+    size_t len = 0;
+    vasnprintf(&ret, &len, format, argp);
+#else
     vasprintf(&ret, format, argp);
+#endif
     va_end(argp);
 
     return ret;