summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Krezović <krezovic.armin@gmail.com>2016-09-10 19:11:21 +0200
committerQuentin Glidic <sardemff7+git@sardemff7.net>2016-09-24 12:16:18 +0200
commit4e2fa0abc3bd359a309a4f215d528156751ff819 (patch)
treeecd20add2807f12c904af77ea1db5e240d7c03b0
parent5d72bc404d053ea61e62f81d4058dec9d2bcf275 (diff)
downloadweston-4e2fa0abc3bd359a309a4f215d528156751ff819.tar.gz
weston-4e2fa0abc3bd359a309a4f215d528156751ff819.tar.bz2
weston-4e2fa0abc3bd359a309a4f215d528156751ff819.zip
libweston-desktop: Fix some clang warnings
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>
-rw-r--r--libweston-desktop/wl-shell.c4
-rw-r--r--libweston-desktop/xdg-shell-v5.c4
-rw-r--r--libweston-desktop/xdg-shell-v6.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/libweston-desktop/wl-shell.c b/libweston-desktop/wl-shell.c
index ded69f73..b5ad334e 100644
--- a/libweston-desktop/wl-shell.c
+++ b/libweston-desktop/wl-shell.c
@@ -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
diff --git a/libweston-desktop/xdg-shell-v5.c b/libweston-desktop/xdg-shell-v5.c
index 14216b08..9fd3a872 100644
--- a/libweston-desktop/xdg-shell-v5.c
+++ b/libweston-desktop/xdg-shell-v5.c
@@ -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
diff --git a/libweston-desktop/xdg-shell-v6.c b/libweston-desktop/xdg-shell-v6.c
index 2afce81a..552b3306 100644
--- a/libweston-desktop/xdg-shell-v6.c
+++ b/libweston-desktop/xdg-shell-v6.c
@@ -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