[gdl/pgriffis/meson-build] win32: Fix misc non-portable code
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdl/pgriffis/meson-build] win32: Fix misc non-portable code
- Date: Mon, 18 Oct 2021 16:50:33 +0000 (UTC)
commit 1c7b89a95ddcbb14105b7e22f91eee7d9d97a209
Author: Patrick Griffis <pgriffis igalia com>
Date: Mon Oct 18 11:39:50 2021 -0500
win32: Fix misc non-portable code
gdl/gdl-dock-object.c | 4 ++--
gdl/gdl-dock-object.h | 6 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/gdl/gdl-dock-object.c b/gdl/gdl-dock-object.c
index e751e99..4bfd511 100644
--- a/gdl/gdl-dock-object.c
+++ b/gdl/gdl-dock-object.c
@@ -1482,9 +1482,9 @@ static void
gdl_dock_object_register_init (void)
{
#ifdef GDL_DISABLE_DEPRECATED
- const size_t n_default = 4;
+#define n_default 4
#else
- const size_t n_default = 5;
+#define n_default 5
#endif
guint i = 0;
struct DockRegisterItem default_items[n_default];
diff --git a/gdl/gdl-dock-object.h b/gdl/gdl-dock-object.h
index c060472..9f031da 100644
--- a/gdl/gdl-dock-object.h
+++ b/gdl/gdl-dock-object.h
@@ -380,7 +380,7 @@ GType gdl_dock_object_set_type_for_nick (const gchar *nick,
*
* Output a debugging message for the corresponding dock object.
*/
-#define GDL_TRACE_OBJECT(object, format, args...) \
+#define GDL_TRACE_OBJECT(object, format, ...) \
G_STMT_START { \
g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_DEBUG, \
@@ -392,9 +392,7 @@ GType gdl_dock_object_set_type_for_nick (const gchar *nick,
G_OBJECT (object)->ref_count, \
(GTK_IS_OBJECT (object) && g_object_is_floating (object)) ? "(float)" : "", \
GDL_IS_DOCK_OBJECT (object) ? gdl_dock_object_is_frozen (GDL_DOCK_OBJECT (object)) : -1, \
- ##args); } G_STMT_END
-
-
+ __VA_ARGS__); } G_STMT_END
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]