From 22b23a6d19c20d20c1b8dc6397a62ed1d0c4d26e Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 16 Apr 2021 11:36:18 +0800 Subject: [PATCH] GTK: Fix builds against latest stable GLib with MSVC GLib-2.68.x now considers warning C4098 ('void' function returning a value) as an error, so avoid doing that. --- gtk/gtkcssimagepaintable.c | 6 +++--- gtk/gtknative.c | 4 ++-- gtk/gtkshortcutaction.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk/gtkcssimagepaintable.c b/gtk/gtkcssimagepaintable.c index d4056ab263..d45955c5df 100644 --- a/gtk/gtkcssimagepaintable.c +++ b/gtk/gtkcssimagepaintable.c @@ -66,9 +66,9 @@ gtk_css_image_paintable_snapshot (GtkCssImage *image, { GtkCssImagePaintable *paintable = GTK_CSS_IMAGE_PAINTABLE (image); - return gdk_paintable_snapshot (get_paintable (paintable), - snapshot, - width, height); + gdk_paintable_snapshot (get_paintable (paintable), + snapshot, + width, height); } static GtkCssImage * diff --git a/gtk/gtknative.c b/gtk/gtknative.c index 546b088a43..7856d4f486 100644 --- a/gtk/gtknative.c +++ b/gtk/gtknative.c @@ -102,7 +102,7 @@ gtk_native_layout (GtkNative *self, int width, int height) { - return GTK_NATIVE_GET_IFACE (self)->layout (self, width, height); + GTK_NATIVE_GET_IFACE (self)->layout (self, width, height); } static void @@ -258,7 +258,7 @@ gtk_native_get_surface_transform (GtkNative *self, g_return_if_fail (x != NULL); g_return_if_fail (y != NULL); - return GTK_NATIVE_GET_IFACE (self)->get_surface_transform (self, x, y); + GTK_NATIVE_GET_IFACE (self)->get_surface_transform (self, x, y); } /** diff --git a/gtk/gtkshortcutaction.c b/gtk/gtkshortcutaction.c index 732dfdf0b9..a93c06386d 100644 --- a/gtk/gtkshortcutaction.c +++ b/gtk/gtkshortcutaction.c @@ -132,7 +132,7 @@ gtk_shortcut_action_print (GtkShortcutAction *self, g_return_if_fail (GTK_IS_SHORTCUT_ACTION (self)); g_return_if_fail (string != NULL); - return GTK_SHORTCUT_ACTION_GET_CLASS (self)->print (self, string); + GTK_SHORTCUT_ACTION_GET_CLASS (self)->print (self, string); } /**