libweston-desktop: Fix some clang warnings
authorArmin Krezović <krezovic.armin@gmail.com>
Sat, 10 Sep 2016 17:11:21 +0000 (19:11 +0200)
committerQuentin Glidic <sardemff7+git@sardemff7.net>
Sat, 24 Sep 2016 10:16:18 +0000 (12:16 +0200)
Fixes:

implicit conversion from enumeration type '...' to different
enumeration type '...' [-Wenum-conversion]

Signed-off-by: Armin Krezović <krezovic.armin@gmail.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
libweston-desktop/wl-shell.c
libweston-desktop/xdg-shell-v5.c
libweston-desktop/xdg-shell-v6.c

index ded69f7..b5ad334 100644 (file)
@@ -231,8 +231,10 @@ weston_desktop_wl_shell_surface_protocol_resize(struct wl_client *wl_client,
        struct weston_seat *seat = wl_resource_get_user_data(seat_resource);
        struct weston_desktop_wl_shell_surface *surface =
                weston_desktop_surface_get_implementation_data(dsurface);
+       enum weston_desktop_surface_edge surf_edges =
+               (enum weston_desktop_surface_edge) edges;
 
-       weston_desktop_api_resize(surface->desktop, dsurface, seat, serial, edges);
+       weston_desktop_api_resize(surface->desktop, dsurface, seat, serial, surf_edges);
 }
 
 static void
index 14216b0..9fd3a87 100644 (file)
@@ -395,9 +395,11 @@ weston_desktop_xdg_surface_protocol_resize(struct wl_client *wl_client,
                wl_resource_get_user_data(seat_resource);
        struct weston_desktop_xdg_surface *surface =
                weston_desktop_surface_get_implementation_data(dsurface);
+       enum weston_desktop_surface_edge surf_edges =
+               (enum weston_desktop_surface_edge) edges;
 
        weston_desktop_xdg_surface_ensure_added(surface);
-       weston_desktop_api_resize(surface->desktop, dsurface, seat, serial, edges);
+       weston_desktop_api_resize(surface->desktop, dsurface, seat, serial, surf_edges);
 }
 
 static void
index 2afce81..552b330 100644 (file)
@@ -396,6 +396,8 @@ weston_desktop_xdg_toplevel_protocol_resize(struct wl_client *wl_client,
                wl_resource_get_user_data(seat_resource);
        struct weston_desktop_xdg_toplevel *toplevel =
                weston_desktop_surface_get_implementation_data(dsurface);
+       enum weston_desktop_surface_edge surf_edges =
+               (enum weston_desktop_surface_edge) edges;
 
        if (!toplevel->base.configured) {
                wl_resource_post_error(toplevel->resource,
@@ -405,7 +407,7 @@ weston_desktop_xdg_toplevel_protocol_resize(struct wl_client *wl_client,
        }
 
        weston_desktop_api_resize(toplevel->base.desktop,
-                                 dsurface, seat, serial, edges);
+                                 dsurface, seat, serial, surf_edges);
 }
 
 static void