[gtk/gtk-4-2: 39/91] GDK: Fix builds against latest stable GLib with MSVC
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-4-2: 39/91] GDK: Fix builds against latest stable GLib with MSVC
- Date: Tue, 4 May 2021 02:05:41 +0000 (UTC)
commit 7ef493ec88470ee096fa17f93ad678c324a7aa2f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Apr 16 11:22:27 2021 +0800
GDK: 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.
gdk/gdkclipboard.c | 20 ++++++++++----------
gdk/gdkcontentprovider.c | 4 ++--
gdk/gdktexture.c | 2 +-
gdk/gdktoplevel.c | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/gdk/gdkclipboard.c b/gdk/gdkclipboard.c
index df20366d53..c3a4759c79 100644
--- a/gdk/gdkclipboard.c
+++ b/gdk/gdkclipboard.c
@@ -554,19 +554,19 @@ gdk_clipboard_store_async (GdkClipboard *clipboard,
if (priv->local)
{
- return GDK_CLIPBOARD_GET_CLASS (clipboard)->store_async (clipboard,
- io_priority,
- cancellable,
- callback,
- user_data);
+ GDK_CLIPBOARD_GET_CLASS (clipboard)->store_async (clipboard,
+ io_priority,
+ cancellable,
+ callback,
+ user_data);
}
else
{
- return gdk_clipboard_store_default_async (clipboard,
- io_priority,
- cancellable,
- callback,
- user_data);
+ gdk_clipboard_store_default_async (clipboard,
+ io_priority,
+ cancellable,
+ callback,
+ user_data);
}
}
diff --git a/gdk/gdkcontentprovider.c b/gdk/gdkcontentprovider.c
index b01cb43e93..15e183a178 100644
--- a/gdk/gdkcontentprovider.c
+++ b/gdk/gdkcontentprovider.c
@@ -377,7 +377,7 @@ gdk_content_provider_attach_clipboard (GdkContentProvider *provider,
g_return_if_fail (GDK_IS_CONTENT_PROVIDER (provider));
g_return_if_fail (GDK_IS_CLIPBOARD (clipboard));
- return GDK_CONTENT_PROVIDER_GET_CLASS (provider)->attach_clipboard (provider, clipboard);
+ GDK_CONTENT_PROVIDER_GET_CLASS (provider)->attach_clipboard (provider, clipboard);
}
void
@@ -387,5 +387,5 @@ gdk_content_provider_detach_clipboard (GdkContentProvider *provider,
g_return_if_fail (GDK_IS_CONTENT_PROVIDER (provider));
g_return_if_fail (GDK_IS_CLIPBOARD (clipboard));
- return GDK_CONTENT_PROVIDER_GET_CLASS (provider)->detach_clipboard (provider, clipboard);
+ GDK_CONTENT_PROVIDER_GET_CLASS (provider)->detach_clipboard (provider, clipboard);
}
diff --git a/gdk/gdktexture.c b/gdk/gdktexture.c
index 07235eb97c..3a22d2133e 100644
--- a/gdk/gdktexture.c
+++ b/gdk/gdktexture.c
@@ -446,7 +446,7 @@ gdk_texture_download_area (GdkTexture *texture,
g_assert (area->x + area->width <= texture->width);
g_assert (area->y + area->height <= texture->height);
- return GDK_TEXTURE_GET_CLASS (texture)->download (texture, area, data, stride);
+ GDK_TEXTURE_GET_CLASS (texture)->download (texture, area, data, stride);
}
/**
diff --git a/gdk/gdktoplevel.c b/gdk/gdktoplevel.c
index 1cf8188b8b..ac89e61671 100644
--- a/gdk/gdktoplevel.c
+++ b/gdk/gdktoplevel.c
@@ -364,7 +364,7 @@ gdk_toplevel_focus (GdkToplevel *toplevel,
{
g_return_if_fail (GDK_IS_TOPLEVEL (toplevel));
- return GDK_TOPLEVEL_GET_IFACE (toplevel)->focus (toplevel, timestamp);
+ GDK_TOPLEVEL_GET_IFACE (toplevel)->focus (toplevel, timestamp);
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]