[gtk/latest.glib.msvc: 2/3] GSK: Fix builds against latest stable GLib with MSVC




commit 8df32e93bea21a67d41ded974f991e9c67e942b6
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Apr 16 11:33:00 2021 +0800

    GSK: 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.

 gsk/gskrendernode.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gsk/gskrendernode.c b/gsk/gskrendernode.c
index fb2ddd3962..ed1a1eb7f8 100644
--- a/gsk/gskrendernode.c
+++ b/gsk/gskrendernode.c
@@ -549,14 +549,14 @@ gsk_render_node_diff (GskRenderNode  *node1,
     return;
 
   if (_gsk_render_node_get_node_type (node1) == _gsk_render_node_get_node_type (node2))
-    return GSK_RENDER_NODE_GET_CLASS (node1)->diff (node1, node2, region);
+    GSK_RENDER_NODE_GET_CLASS (node1)->diff (node1, node2, region);
 
-  if (_gsk_render_node_get_node_type (node1) == GSK_CONTAINER_NODE)
-    return gsk_container_node_diff_with (node1, node2, region);
-  if (_gsk_render_node_get_node_type (node2) == GSK_CONTAINER_NODE)
-    return gsk_container_node_diff_with (node2, node1, region);
-
-  return gsk_render_node_diff_impossible (node1, node2, region);
+  else if (_gsk_render_node_get_node_type (node1) == GSK_CONTAINER_NODE)
+    gsk_container_node_diff_with (node1, node2, region);
+  else if (_gsk_render_node_get_node_type (node2) == GSK_CONTAINER_NODE)
+    gsk_container_node_diff_with (node2, node1, region);
+  else
+    gsk_render_node_diff_impossible (node1, node2, region);
 }
 
 /**


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]