[gtk/wip.win32.fixes: 42/42] GTK: Fix builds against latest stable GLib with MSVC
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip.win32.fixes: 42/42] GTK: Fix builds against latest stable GLib with MSVC
- Date: Fri, 16 Apr 2021 04:24:33 +0000 (UTC)
commit 495e1648c8f5116191e17f6328df356d79a75328
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Apr 16 11:36:18 2021 +0800
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 7870b0465c..62d213911d 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);
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]