Commit 14632e11 authored by Chun-wei Fan's avatar Chun-wei Fan
Browse files

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.
parent 24cd0567
...@@ -554,19 +554,19 @@ gdk_clipboard_store_async (GdkClipboard *clipboard, ...@@ -554,19 +554,19 @@ gdk_clipboard_store_async (GdkClipboard *clipboard,
if (priv->local) if (priv->local)
{ {
return GDK_CLIPBOARD_GET_CLASS (clipboard)->store_async (clipboard, GDK_CLIPBOARD_GET_CLASS (clipboard)->store_async (clipboard,
io_priority, io_priority,
cancellable, cancellable,
callback, callback,
user_data); user_data);
} }
else else
{ {
return gdk_clipboard_store_default_async (clipboard, gdk_clipboard_store_default_async (clipboard,
io_priority, io_priority,
cancellable, cancellable,
callback, callback,
user_data); user_data);
} }
} }
......
...@@ -377,7 +377,7 @@ gdk_content_provider_attach_clipboard (GdkContentProvider *provider, ...@@ -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_CONTENT_PROVIDER (provider));
g_return_if_fail (GDK_IS_CLIPBOARD (clipboard)); 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 void
...@@ -387,5 +387,5 @@ gdk_content_provider_detach_clipboard (GdkContentProvider *provider, ...@@ -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_CONTENT_PROVIDER (provider));
g_return_if_fail (GDK_IS_CLIPBOARD (clipboard)); 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);
} }
...@@ -446,7 +446,7 @@ gdk_texture_download_area (GdkTexture *texture, ...@@ -446,7 +446,7 @@ gdk_texture_download_area (GdkTexture *texture,
g_assert (area->x + area->width <= texture->width); g_assert (area->x + area->width <= texture->width);
g_assert (area->y + area->height <= texture->height); 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);
} }
/** /**
......
...@@ -364,7 +364,7 @@ gdk_toplevel_focus (GdkToplevel *toplevel, ...@@ -364,7 +364,7 @@ gdk_toplevel_focus (GdkToplevel *toplevel,
{ {
g_return_if_fail (GDK_IS_TOPLEVEL (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);
} }
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment