From d7bb3b55425b8b6f910fb331046757947896f9dc Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Wed, 1 Feb 2017 16:05:23 +1100 Subject: [PATCH] vkwindow: fix build error on i386 Vulkan handles are either pointers (64-bit) or 64-bit integer handles (32-bit). Cast the type in failure cases. vkwindow.c:229:561: error: return makes integer from pointer without a cast [-Werror=int-conversion] vkwindow.c:231:194: error: return makes integer from pointer without a cast [-Werror=int-conversion] https://bugzilla.gnome.org/show_bug.cgi?id=777979 --- ext/vulkan/vkwindow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/vulkan/vkwindow.c b/ext/vulkan/vkwindow.c index 56b3e60636..ab8c45c5fb 100644 --- a/ext/vulkan/vkwindow.c +++ b/ext/vulkan/vkwindow.c @@ -226,9 +226,9 @@ gst_vulkan_window_get_surface (GstVulkanWindow * window, GError ** error) { GstVulkanWindowClass *klass; - g_return_val_if_fail (GST_IS_VULKAN_WINDOW (window), NULL); + g_return_val_if_fail (GST_IS_VULKAN_WINDOW (window), (VkSurfaceKHR) 0); klass = GST_VULKAN_WINDOW_GET_CLASS (window); - g_return_val_if_fail (klass->get_surface != NULL, NULL); + g_return_val_if_fail (klass->get_surface != NULL, (VkSurfaceKHR) 0); return klass->get_surface (window, error); }