Commit 8df32e93 authored by Chun-wei Fan's avatar Chun-wei Fan
Browse files

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.
parent 14632e11
......@@ -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);
}
/**
......
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