From 05092351dfcca1b5e1981724efe1be69ea75d322 Mon Sep 17 00:00:00 2001 From: Evan Miller Date: Wed, 5 Aug 2020 09:35:19 -0400 Subject: [PATCH] Don't rely on strdup / cygwin fix --- include/mdbfakeglib.h | 8 +------- src/libmdb/fakeglib.c | 8 +++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/mdbfakeglib.h b/include/mdbfakeglib.h index 5a0262d..2b5766d 100644 --- a/include/mdbfakeglib.h +++ b/include/mdbfakeglib.h @@ -4,7 +4,6 @@ #include #include #include -#include #include // for ntohl @@ -96,12 +95,6 @@ typedef struct GOptionContext { #define g_free free #define g_realloc realloc -#if defined _WIN32 -#define g_strdup _strdup -#else -#define g_strdup strdup -#endif - #define G_STR_DELIMITERS "_-|> <." #define g_ptr_array_index(array, i) \ @@ -125,6 +118,7 @@ int g_str_equal(const void *str1, const void *str2); char **g_strsplit(const char *haystack, const char *needle, int something); void g_strfreev(char **dir); char *g_strconcat(const char *first, ...); +char *g_strdup(const char *src); char *g_strdup_printf(const char *format, ...); gchar *g_strdelimit(gchar *string, const gchar *delimiters, gchar new_delimiter); diff --git a/src/libmdb/fakeglib.c b/src/libmdb/fakeglib.c index 199308b..c799c6d 100644 --- a/src/libmdb/fakeglib.c +++ b/src/libmdb/fakeglib.c @@ -5,6 +5,7 @@ #include #include #include +#include #include /* string functions */ @@ -101,12 +102,17 @@ int vasprintf(char **ret, const char *format, va_list ap) { } #endif +char *g_strdup(const char *input) { + size_t len = strlen(input); + return g_memdup(input, len+1); +} + char *g_strdup_printf(const char *format, ...) { char *ret = NULL; va_list argp; va_start(argp, format); -#ifdef ___CYGWIN__ +#ifdef __CYGWIN__ size_t len = 0; vasnprintf(&ret, &len, format, argp); #else