From f3c2d1e1455a2447b57d6bbe86fcada338eca4ff Mon Sep 17 00:00:00 2001 From: John Ralls Date: Thu, 25 Mar 2021 13:31:19 -0700 Subject: [PATCH] Fix missing prototype error, void end of function error on Windows. MinGW64 gcc silently ignores C prototype with no arguments, issuing a missing prototype error instead. set_platform_locale must return a free-able char* even if all of LC_ALL, LC_MESSAGES, and LANG are unset. --- gnucash/gnucash-locale-platform.h | 2 +- gnucash/gnucash-locale-windows.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gnucash/gnucash-locale-platform.h b/gnucash/gnucash-locale-platform.h index 1eab7f8daa..737a99b305 100644 --- a/gnucash/gnucash-locale-platform.h +++ b/gnucash/gnucash-locale-platform.h @@ -25,6 +25,6 @@ #ifndef GNUCASH_LOCALE_PLATFORM_H #define GNUCASH_LOCALE_PLATFORM_H -char *set_platform_locale(); +char *set_platform_locale(void); #endif diff --git a/gnucash/gnucash-locale-windows.c b/gnucash/gnucash-locale-windows.c index 2c3b8a51a4..753af7c204 100644 --- a/gnucash/gnucash-locale-windows.c +++ b/gnucash/gnucash-locale-windows.c @@ -33,7 +33,7 @@ * retrieve the Windows locale and set POSIX to match. */ char * -set_platform_locale() +set_platform_locale(void) { WCHAR lpLocaleName[LOCALE_NAME_MAX_LENGTH]; char *locale = NULL; @@ -68,4 +68,5 @@ set_platform_locale() setlocale (LC_ALL, locale); return locale; } + return g_strdup("C"); }