From c5dae810a6ee8323ccdcbf50c27a654186bba644 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Thu, 11 Feb 2021 12:52:11 -0800 Subject: [PATCH] Consistently use GWENHYWFAR_CB in callback decls and defs. To permit successful compilation on Microsoft Windows. Fixes https://www.aquamaniac.de/rdm/issues/231 --- src/gui/gui_be.h | 18 ++++++++-------- src/gui/gui_dialogs.c | 20 ++++++++--------- src/gui/gui_p.h | 18 ++++++++-------- src/gui/nogui.c | 50 +++++++++++++++++++++---------------------- test/testthread.c | 4 ++-- 5 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/gui/gui_be.h b/src/gui/gui_be.h index dc7d82c1..3e1a70d5 100644 --- a/src/gui/gui_be.h +++ b/src/gui/gui_be.h @@ -346,7 +346,7 @@ GWEN_GUI_GETSYNCIO_FN GWEN_Gui_SetGetSyncIoFn(GWEN_GUI *gui, GWEN_GUI_GETSYNCIO_ * Please see @ref GWEN_Gui_MessageBox for details. * */ -typedef int (*GWEN_GUI_MESSAGEBOX_FN)(GWEN_GUI *gui, +typedef int GWENHYWFAR_CB(*GWEN_GUI_MESSAGEBOX_FN)(GWEN_GUI *gui, uint32_t flags, const char *title, const char *text, @@ -359,7 +359,7 @@ typedef int (*GWEN_GUI_MESSAGEBOX_FN)(GWEN_GUI *gui, * Please see @ref GWEN_Gui_InputBox for details. * */ -typedef int (*GWEN_GUI_INPUTBOX_FN)(GWEN_GUI *gui, +typedef int GWENHYWFAR_CB(*GWEN_GUI_INPUTBOX_FN)(GWEN_GUI *gui, uint32_t flags, const char *title, const char *text, @@ -372,7 +372,7 @@ typedef int (*GWEN_GUI_INPUTBOX_FN)(GWEN_GUI *gui, * Please see @ref GWEN_Gui_ShowBox for details. * */ -typedef uint32_t (*GWEN_GUI_SHOWBOX_FN)(GWEN_GUI *gui, +typedef uint32_t GWENHYWFAR_CB(*GWEN_GUI_SHOWBOX_FN)(GWEN_GUI *gui, uint32_t flags, const char *title, const char *text, @@ -382,13 +382,13 @@ typedef uint32_t (*GWEN_GUI_SHOWBOX_FN)(GWEN_GUI *gui, * Please see @ref GWEN_Gui_HideBox for details. * */ -typedef void (*GWEN_GUI_HIDEBOX_FN)(GWEN_GUI *gui, uint32_t id); +typedef void GWENHYWFAR_CB(*GWEN_GUI_HIDEBOX_FN)(GWEN_GUI *gui, uint32_t id); /** * Please see @ref GWEN_Gui_ProgressStart for details. * */ -typedef uint32_t (*GWEN_GUI_PROGRESS_START_FN)(GWEN_GUI *gui, +typedef uint32_t GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_START_FN)(GWEN_GUI *gui, uint32_t progressFlags, const char *title, const char *text, @@ -399,7 +399,7 @@ typedef uint32_t (*GWEN_GUI_PROGRESS_START_FN)(GWEN_GUI *gui, * Please see @ref GWEN_Gui_ProgressAdvance for details. * */ -typedef int (*GWEN_GUI_PROGRESS_ADVANCE_FN)(GWEN_GUI *gui, +typedef int GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_ADVANCE_FN)(GWEN_GUI *gui, uint32_t id, uint64_t progress); @@ -408,7 +408,7 @@ typedef int (*GWEN_GUI_PROGRESS_ADVANCE_FN)(GWEN_GUI *gui, * Please see @ref GWEN_Gui_ProgressSetTotal for details. * */ -typedef int (*GWEN_GUI_PROGRESS_SETTOTAL_FN)(GWEN_GUI *gui, +typedef int GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_SETTOTAL_FN)(GWEN_GUI *gui, uint32_t id, uint64_t total); @@ -416,7 +416,7 @@ typedef int (*GWEN_GUI_PROGRESS_SETTOTAL_FN)(GWEN_GUI *gui, * Please see @ref GWEN_Gui_ProgressLog for details. * */ -typedef int (*GWEN_GUI_PROGRESS_LOG_FN)(GWEN_GUI *gui, +typedef int GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_LOG_FN)(GWEN_GUI *gui, uint32_t id, GWEN_LOGGER_LEVEL level, const char *text); @@ -424,7 +424,7 @@ typedef int (*GWEN_GUI_PROGRESS_LOG_FN)(GWEN_GUI *gui, * Please see @ref GWEN_Gui_ProgressEnd for details. * */ -typedef int (*GWEN_GUI_PROGRESS_END_FN)(GWEN_GUI *gui, uint32_t id); +typedef int GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_END_FN)(GWEN_GUI *gui, uint32_t id); /*@}*/ diff --git a/src/gui/gui_dialogs.c b/src/gui/gui_dialogs.c index 83a15fdc..0dd97075 100644 --- a/src/gui/gui_dialogs.c +++ b/src/gui/gui_dialogs.c @@ -43,7 +43,7 @@ void GWEN_Gui_UseDialogs(GWEN_GUI *gui) -int GWEN_Gui_ShowProgress(GWEN_PROGRESS_DATA *pd) +int GWENHYWFAR_CB GWEN_Gui_ShowProgress(GWEN_PROGRESS_DATA *pd) { GWEN_PROGRESS_DATA *highest=NULL; GWEN_PROGRESS_DATA *t; @@ -132,7 +132,7 @@ void GWEN_Gui_DialogBased_CheckShow(GWEN_UNUSED GWEN_GUI *gui, GWEN_PROGRESS_DAT -uint32_t GWEN_Gui_DialogBased_ProgressStart(GWEN_GUI *gui, +uint32_t GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressStart(GWEN_GUI *gui, uint32_t progressFlags, const char *title, const char *text, @@ -179,7 +179,7 @@ uint32_t GWEN_Gui_DialogBased_ProgressStart(GWEN_GUI *gui, -int GWEN_Gui_DialogBased_ProgressEnd(GWEN_GUI *gui, uint32_t pid) +int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressEnd(GWEN_GUI *gui, uint32_t pid) { GWEN_PROGRESS_DATA *pd; /*uint32_t parentPid=0;*/ @@ -296,7 +296,7 @@ int GWEN_Gui_DialogBased_ProgressEnd(GWEN_GUI *gui, uint32_t pid) -int GWEN_Gui_DialogBased_ProgressAdvance(GWEN_GUI *gui, uint32_t pid, uint64_t progress) +int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressAdvance(GWEN_GUI *gui, uint32_t pid, uint64_t progress) { GWEN_PROGRESS_DATA *pd; int aborted=0; @@ -347,7 +347,7 @@ int GWEN_Gui_DialogBased_ProgressAdvance(GWEN_GUI *gui, uint32_t pid, uint64_t p -int GWEN_Gui_DialogBased_ProgressSetTotal(GWEN_GUI *gui, uint32_t pid, uint64_t total) +int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressSetTotal(GWEN_GUI *gui, uint32_t pid, uint64_t total) { GWEN_PROGRESS_DATA *pd; int aborted=0; @@ -394,7 +394,7 @@ int GWEN_Gui_DialogBased_ProgressSetTotal(GWEN_GUI *gui, uint32_t pid, uint64_t -int GWEN_Gui_DialogBased_ProgressLog(GWEN_GUI *gui, +int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressLog(GWEN_GUI *gui, uint32_t pid, GWEN_LOGGER_LEVEL level, const char *text) @@ -452,7 +452,7 @@ int GWEN_Gui_DialogBased_ProgressLog(GWEN_GUI *gui, -int GWEN_Gui_DialogBased_InputBox(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB GWEN_Gui_DialogBased_InputBox(GWEN_UNUSED GWEN_GUI *gui, uint32_t flags, const char *title, const char *text, @@ -494,7 +494,7 @@ int GWEN_Gui_DialogBased_InputBox(GWEN_UNUSED GWEN_GUI *gui, -int GWEN_Gui_DialogBased_MessageBox(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB GWEN_Gui_DialogBased_MessageBox(GWEN_UNUSED GWEN_GUI *gui, uint32_t flags, const char *title, const char *text, @@ -520,7 +520,7 @@ int GWEN_Gui_DialogBased_MessageBox(GWEN_UNUSED GWEN_GUI *gui, -uint32_t GWEN_Gui_DialogBased_ShowBox(GWEN_GUI *gui, +uint32_t GWENHYWFAR_CB GWEN_Gui_DialogBased_ShowBox(GWEN_GUI *gui, uint32_t flags, const char *title, const char *text, @@ -554,7 +554,7 @@ uint32_t GWEN_Gui_DialogBased_ShowBox(GWEN_GUI *gui, -void GWEN_Gui_DialogBased_HideBox(GWEN_GUI *gui, uint32_t id) +void GWENHYWFAR_CB GWEN_Gui_DialogBased_HideBox(GWEN_GUI *gui, uint32_t id) { GWEN_DIALOG *dlg; diff --git a/src/gui/gui_p.h b/src/gui/gui_p.h index 3cb928da..71204966 100644 --- a/src/gui/gui_p.h +++ b/src/gui/gui_p.h @@ -109,22 +109,22 @@ static int GWENHYWFAR_CB GWEN_Gui_CheckCertBuiltIn(GWEN_GUI *gui, static void GWEN_Gui_DialogBased_CheckShow(GWEN_GUI *gui, GWEN_PROGRESS_DATA *pd); -static uint32_t GWEN_Gui_DialogBased_ProgressStart(GWEN_GUI *gui, +static uint32_t GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressStart(GWEN_GUI *gui, uint32_t progressFlags, const char *title, const char *text, uint64_t total, uint32_t guiid); -static int GWEN_Gui_DialogBased_ProgressEnd(GWEN_GUI *gui, uint32_t pid); -static int GWEN_Gui_DialogBased_ProgressAdvance(GWEN_GUI *gui, uint32_t pid, uint64_t progress); -static int GWEN_Gui_DialogBased_ProgressSetTotal(GWEN_GUI *gui, uint32_t pid, uint64_t total); +static int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressEnd(GWEN_GUI *gui, uint32_t pid); +static int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressAdvance(GWEN_GUI *gui, uint32_t pid, uint64_t progress); +static int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressSetTotal(GWEN_GUI *gui, uint32_t pid, uint64_t total); -static int GWEN_Gui_DialogBased_ProgressLog(GWEN_GUI *gui, +static int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressLog(GWEN_GUI *gui, uint32_t pid, GWEN_LOGGER_LEVEL level, const char *text); -static int GWEN_Gui_DialogBased_InputBox(GWEN_GUI *gui, +static int GWENHYWFAR_CB GWEN_Gui_DialogBased_InputBox(GWEN_GUI *gui, uint32_t flags, const char *title, const char *text, @@ -133,7 +133,7 @@ static int GWEN_Gui_DialogBased_InputBox(GWEN_GUI *gui, int maxLen, uint32_t guiid); -static int GWEN_Gui_DialogBased_MessageBox(GWEN_GUI *gui, +static int GWENHYWFAR_CB GWEN_Gui_DialogBased_MessageBox(GWEN_GUI *gui, uint32_t flags, const char *title, const char *text, @@ -142,12 +142,12 @@ static int GWEN_Gui_DialogBased_MessageBox(GWEN_GUI *gui, const char *b3, uint32_t guiid); -static uint32_t GWEN_Gui_DialogBased_ShowBox(GWEN_GUI *gui, +static uint32_t GWENHYWFAR_CB GWEN_Gui_DialogBased_ShowBox(GWEN_GUI *gui, uint32_t flags, const char *title, const char *text, uint32_t guiid); -static void GWEN_Gui_DialogBased_HideBox(GWEN_GUI *gui, uint32_t id); +static void GWENHYWFAR_CB GWEN_Gui_DialogBased_HideBox(GWEN_GUI *gui, uint32_t id); static int GWENHYWFAR_CB GWEN_Gui_Internal_GetSyncIo(GWEN_GUI *gui, const char *url, const char *defaultProto, diff --git a/src/gui/nogui.c b/src/gui/nogui.c index 69d5fbe6..f88c2c53 100644 --- a/src/gui/nogui.c +++ b/src/gui/nogui.c @@ -219,7 +219,7 @@ GWEN_GUI *GWEN_NoGui_new(void) -void _freeData(GWEN_UNUSED void *bp, void *p) +void GWENHYWFAR_CB _freeData(GWEN_UNUSED void *bp, void *p) { GWEN_GUI_NOGUI *xgui; @@ -230,7 +230,7 @@ void _freeData(GWEN_UNUSED void *bp, void *p) -int _messageBox(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _messageBox(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t flags, GWEN_UNUSED const char *title, GWEN_UNUSED const char *text, @@ -244,7 +244,7 @@ int _messageBox(GWEN_UNUSED GWEN_GUI *gui, -int _inputBox(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _inputBox(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t flags, GWEN_UNUSED const char *title, GWEN_UNUSED const char *text, @@ -258,7 +258,7 @@ int _inputBox(GWEN_UNUSED GWEN_GUI *gui, -uint32_t _showBox(GWEN_UNUSED GWEN_GUI *gui, +uint32_t GWENHYWFAR_CB _showBox(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t flags, GWEN_UNUSED const char *title, GWEN_UNUSED const char *text, @@ -269,13 +269,13 @@ uint32_t _showBox(GWEN_UNUSED GWEN_GUI *gui, -void _hideBox(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t id) +void GWENHYWFAR_CB _hideBox(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t id) { } -uint32_t _progressStart(GWEN_UNUSED GWEN_GUI *gui, +uint32_t GWENHYWFAR_CB _progressStart(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t progressFlags, GWEN_UNUSED const char *title, GWEN_UNUSED const char *text, @@ -287,7 +287,7 @@ uint32_t _progressStart(GWEN_UNUSED GWEN_GUI *gui, -int _progressAdvance(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _progressAdvance(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t pid, GWEN_UNUSED uint64_t progress) { @@ -296,7 +296,7 @@ int _progressAdvance(GWEN_UNUSED GWEN_GUI *gui, -int _progressSetTotal(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _progressSetTotal(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t pid, GWEN_UNUSED uint64_t total) { @@ -305,7 +305,7 @@ int _progressSetTotal(GWEN_UNUSED GWEN_GUI *gui, -int _progressLog(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _progressLog(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t pid, GWEN_UNUSED GWEN_LOGGER_LEVEL level, GWEN_UNUSED const char *text) @@ -315,7 +315,7 @@ int _progressLog(GWEN_UNUSED GWEN_GUI *gui, -int _progressEnd(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _progressEnd(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t pid) { return 0; @@ -323,7 +323,7 @@ int _progressEnd(GWEN_UNUSED GWEN_GUI *gui, -int _print(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _print(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED const char *docTitle, GWEN_UNUSED const char *docType, GWEN_UNUSED const char *descr, @@ -335,7 +335,7 @@ int _print(GWEN_UNUSED GWEN_GUI *gui, -int _getPassword(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _getPassword(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t flags, GWEN_UNUSED const char *token, GWEN_UNUSED const char *title, @@ -352,7 +352,7 @@ int _getPassword(GWEN_UNUSED GWEN_GUI *gui, -int _setPasswordStatus(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _setPasswordStatus(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED const char *token, GWEN_UNUSED const char *pin, GWEN_UNUSED GWEN_GUI_PASSWORD_STATUS status, @@ -363,7 +363,7 @@ int _setPasswordStatus(GWEN_UNUSED GWEN_GUI *gui, -int _logHook(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _logHook(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED const char *logDomain, GWEN_UNUSED GWEN_LOGGER_LEVEL priority, GWEN_UNUSED const char *s) @@ -373,7 +373,7 @@ int _logHook(GWEN_UNUSED GWEN_GUI *gui, -int _waitForSockets(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _waitForSockets(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED GWEN_SOCKET_LIST2 *readSockets, GWEN_UNUSED GWEN_SOCKET_LIST2 *writeSockets, GWEN_UNUSED int msecs, @@ -384,7 +384,7 @@ int _waitForSockets(GWEN_UNUSED GWEN_GUI *gui, -int _checkCert(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _checkCert(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED const GWEN_SSLCERTDESCR *cert, GWEN_UNUSED GWEN_SYNCIO *sio, GWEN_UNUSED uint32_t guiid) @@ -394,7 +394,7 @@ int _checkCert(GWEN_UNUSED GWEN_GUI *gui, -int _keyDataFromTextOpenSsl(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _keyDataFromTextOpenSsl(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED const char *text, GWEN_UNUSED unsigned char *buffer, GWEN_UNUSED unsigned int bufLength) @@ -404,7 +404,7 @@ int _keyDataFromTextOpenSsl(GWEN_UNUSED GWEN_GUI *gui, -int _execDialog(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _execDialog(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED GWEN_DIALOG *dlg, GWEN_UNUSED uint32_t guiid) { @@ -413,7 +413,7 @@ int _execDialog(GWEN_UNUSED GWEN_GUI *gui, -int _openDialog(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _openDialog(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED GWEN_DIALOG *dlg, GWEN_UNUSED uint32_t guiid) { @@ -422,7 +422,7 @@ int _openDialog(GWEN_UNUSED GWEN_GUI *gui, -int _closeDialog(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _closeDialog(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED GWEN_DIALOG *dlg) { return 0; @@ -430,7 +430,7 @@ int _closeDialog(GWEN_UNUSED GWEN_GUI *gui, -int _runDialog(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _runDialog(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED GWEN_DIALOG *dlg, GWEN_UNUSED int timeout) { @@ -439,7 +439,7 @@ int _runDialog(GWEN_UNUSED GWEN_GUI *gui, -int _readDialogPrefs(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _readDialogPrefs(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED const char *groupName, GWEN_UNUSED const char *altName, GWEN_UNUSED GWEN_DB_NODE **pDb) @@ -449,7 +449,7 @@ int _readDialogPrefs(GWEN_UNUSED GWEN_GUI *gui, -int _writeDialogPrefs(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _writeDialogPrefs(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED const char *groupName, GWEN_UNUSED GWEN_DB_NODE *db) { @@ -458,7 +458,7 @@ int _writeDialogPrefs(GWEN_UNUSED GWEN_GUI *gui, -int _getFilename(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _getFilename(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED const char *caption, GWEN_UNUSED GWEN_GUI_FILENAME_TYPE fnt, GWEN_UNUSED uint32_t flags, @@ -471,7 +471,7 @@ int _getFilename(GWEN_UNUSED GWEN_GUI *gui, -int _getSyncio(GWEN_UNUSED GWEN_GUI *gui, +int GWENHYWFAR_CB _getSyncio(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED const char *url, GWEN_UNUSED const char *defaultProto, GWEN_UNUSED int defaultPort, diff --git a/test/testthread.c b/test/testthread.c index 4b24ee57..63d63530 100644 --- a/test/testthread.c +++ b/test/testthread.c @@ -49,7 +49,7 @@ GWEN_THREAD *TestThread_new(int threadId, int loops) -void _freeData(GWEN_UNUSED void *bp, void *p) +void GWENHYWFAR_CB _freeData(GWEN_UNUSED void *bp, void *p) { TEST_THREAD *xthr; @@ -59,7 +59,7 @@ void _freeData(GWEN_UNUSED void *bp, void *p) -void _threadRun_cb(GWEN_UNUSED GWEN_THREAD *thr) +void GWENHYWFAR_CB _threadRun_cb(GWEN_UNUSED GWEN_THREAD *thr) { GWEN_GUI *gui; TEST_THREAD *xthr; -- 2.30.0