From 5af9f7ef618db5956c00d6b1c7f35f33b693479d Mon Sep 17 00:00:00 2001 From: Giovanni Panozzo Date: Thu, 21 May 2020 15:53:23 +0200 Subject: Change __VA_OPT__ to ## to support clang --- plugins/exec/exec_plugin.c | 2 +- plugins/nx/nx_plugin.h | 2 +- plugins/rdp/rdp_plugin.h | 2 +- plugins/secret/src/glibsecret_plugin.c | 2 +- plugins/st/st_plugin.c | 2 +- plugins/vnc/vnc_plugin.c | 2 +- plugins/www/www_plugin.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/exec/exec_plugin.c b/plugins/exec/exec_plugin.c index 04b1532f2..81d7a5235 100644 --- a/plugins/exec/exec_plugin.c +++ b/plugins/exec/exec_plugin.c @@ -56,7 +56,7 @@ typedef struct _RemminaPluginExecData { } RemminaPluginExecData; static RemminaPluginService *remmina_plugin_service = NULL; -#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__) +#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt, ##__VA_ARGS__) static void diff --git a/plugins/nx/nx_plugin.h b/plugins/nx/nx_plugin.h index 84cce9792..aa294b938 100644 --- a/plugins/nx/nx_plugin.h +++ b/plugins/nx/nx_plugin.h @@ -76,6 +76,6 @@ typedef struct _RemminaPluginNxData { } RemminaPluginNxData; extern RemminaPluginService *remmina_plugin_nx_service; -#define remmina_plugin_debug(fmt, ...) remmina_plugin_nx_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__) +#define remmina_plugin_debug(fmt, ...) remmina_plugin_nx_service->_remmina_debug(__func__, fmt, ##__VA_ARGS__) G_END_DECLS diff --git a/plugins/rdp/rdp_plugin.h b/plugins/rdp/rdp_plugin.h index 7ffa02426..d0a991046 100644 --- a/plugins/rdp/rdp_plugin.h +++ b/plugins/rdp/rdp_plugin.h @@ -66,7 +66,7 @@ typedef struct rf_context rfContext; #define DEFAULT_QUALITY_9 0x80 extern RemminaPluginService *remmina_plugin_service; -#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__) +#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt, ##__VA_ARGS__) struct rf_clipboard { rfContext * rfi; diff --git a/plugins/secret/src/glibsecret_plugin.c b/plugins/secret/src/glibsecret_plugin.c index 58f1eac44..97af04866 100644 --- a/plugins/secret/src/glibsecret_plugin.c +++ b/plugins/secret/src/glibsecret_plugin.c @@ -43,7 +43,7 @@ #include static RemminaPluginService *remmina_plugin_service = NULL; -#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__) +#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt, ##__VA_ARGS__) static SecretSchema remmina_file_secret_schema = diff --git a/plugins/st/st_plugin.c b/plugins/st/st_plugin.c index ae99d4d65..ae7eee7a2 100644 --- a/plugins/st/st_plugin.c +++ b/plugins/st/st_plugin.c @@ -54,7 +54,7 @@ typedef struct _RemminaPluginData } RemminaPluginData; static RemminaPluginService *remmina_plugin_service = NULL; -#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__) +#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt, ##__VA_ARGS__) static gboolean remmina_st_query_feature(RemminaProtocolWidget* gp, const RemminaProtocolFeature* feature) { diff --git a/plugins/vnc/vnc_plugin.c b/plugins/vnc/vnc_plugin.c index 8ca23bf24..8dc6fea4e 100644 --- a/plugins/vnc/vnc_plugin.c +++ b/plugins/vnc/vnc_plugin.c @@ -51,7 +51,7 @@ #define GET_PLUGIN_DATA(gp) (RemminaPluginVncData *)g_object_get_data(G_OBJECT(gp), "plugin-data") static RemminaPluginService *remmina_plugin_service = NULL; -#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__) +#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt, ##__VA_ARGS__) static int dot_cursor_x_hot = 2; static int dot_cursor_y_hot = 2; diff --git a/plugins/www/www_plugin.h b/plugins/www/www_plugin.h index bfa8a4b0f..aca70c889 100644 --- a/plugins/www/www_plugin.h +++ b/plugins/www/www_plugin.h @@ -48,7 +48,7 @@ typedef enum { } WWWWebViewDocumentType; extern RemminaPluginService *remmina_plugin_service; -#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__) +#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt, ##__VA_ARGS__) G_BEGIN_DECLS -- cgit v1.2.3