mirror of
https://github.com/mdbtools/mdbtools.git
synced 2025-09-19 18:47:54 +08:00
Another attempted Cygwin fix
This commit is contained in:
@@ -96,7 +96,7 @@ typedef struct GOptionContext {
|
|||||||
#define g_free free
|
#define g_free free
|
||||||
#define g_realloc realloc
|
#define g_realloc realloc
|
||||||
|
|
||||||
#if defined _WIN32 || defined __CYGWIN__
|
#if defined _WIN32
|
||||||
#define g_strdup _strdup
|
#define g_strdup _strdup
|
||||||
#else
|
#else
|
||||||
#define g_strdup strdup
|
#define g_strdup strdup
|
||||||
|
@@ -83,7 +83,7 @@ char *g_strconcat(const char *first, ...) {
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined _WIN32 || defined __CYGWIN__
|
#if defined _WIN32
|
||||||
int vasprintf(char **ret, const char *format, va_list ap) {
|
int vasprintf(char **ret, const char *format, va_list ap) {
|
||||||
int len;
|
int len;
|
||||||
int retval;
|
int retval;
|
||||||
@@ -106,7 +106,12 @@ char *g_strdup_printf(const char *format, ...) {
|
|||||||
va_list argp;
|
va_list argp;
|
||||||
|
|
||||||
va_start(argp, format);
|
va_start(argp, format);
|
||||||
|
#ifdef ___CYGWIN__
|
||||||
|
size_t len = 0;
|
||||||
|
vasnprintf(&ret, &len, format, argp);
|
||||||
|
#else
|
||||||
vasprintf(&ret, format, argp);
|
vasprintf(&ret, format, argp);
|
||||||
|
#endif
|
||||||
va_end(argp);
|
va_end(argp);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
Reference in New Issue
Block a user