xwayland: Silence a few warnings

4 files changed, 5 insertions, 7 deletions

diff --git a/hw/xfree86/xwayland/xwayland-drm.c b/hw/xfree86/xwayland/xwayland-drm.c
index cf1124e9a..6ac5c7d7b 100644
--- a/hw/xfree86/xwayland/xwayland-drm.c
+++ b/hw/xfree86/xwayland/xwayland-drm.c
@@ -75,7 +75,7 @@ static const struct wl_drm_listener xwl_drm_listener =
 };
 
 static void
-drm_handler(struct wl_display *display,
+drm_handler(struct wl_display *display_,
 	      uint32_t id,
 	      const char *interface,
 	      uint32_t version,
@@ -163,7 +163,6 @@ xwl_create_window_buffer_drm(struct xwl_window *xwl_window,
 			     PixmapPtr pixmap, uint32_t name)
 {
     VisualID visual;
-    uint32_t format;
     WindowPtr window = xwl_window->window;
     ScreenPtr screen = window->drawable.pScreen;
     int i;
diff --git a/hw/xfree86/xwayland/xwayland-input.c b/hw/xfree86/xwayland/xwayland-input.c
index cb13d5c7c..a06cf2004 100644
--- a/hw/xfree86/xwayland/xwayland-input.c
+++ b/hw/xfree86/xwayland/xwayland-input.c
@@ -266,11 +266,11 @@ pointer_handle_enter(void *data, struct wl_pointer *pointer,
 
 {
     struct xwl_seat *xwl_seat = data;
+    DeviceIntPtr dev = xwl_seat->pointer;
+    int i;
 
     xwl_seat->xwl_screen->serial = serial;
     xwl_seat->pointer_enter_serial = serial;
-    DeviceIntPtr dev = xwl_seat->pointer;
-    int i;
 
     xwl_seat->focus_window = wl_surface_get_user_data(surface);
 
diff --git a/hw/xfree86/xwayland/xwayland-output.c b/hw/xfree86/xwayland/xwayland-output.c
index f48000107..e596bbdc9 100644
--- a/hw/xfree86/xwayland/xwayland-output.c
+++ b/hw/xfree86/xwayland/xwayland-output.c
@@ -277,7 +277,7 @@ static const struct wl_output_listener output_listener = {
 };
 
 static void
-global_handler(struct wl_display *display,
+global_handler(struct wl_display *display_,
 	       uint32_t id,
 	       const char *interface,
 	       uint32_t version,
diff --git a/hw/xfree86/xwayland/xwayland.c b/hw/xfree86/xwayland/xwayland.c
index 40650e730..f32d561e9 100644
--- a/hw/xfree86/xwayland/xwayland.c
+++ b/hw/xfree86/xwayland/xwayland.c
@@ -98,7 +98,7 @@ static const struct wl_callback_listener delayed_init_listner = {
 };
 
 static void
-global_handler(struct wl_display *display,
+global_handler(struct wl_display *display_,
 	       uint32_t id,
 	       const char *interface,
 	       uint32_t version,
@@ -184,7 +184,6 @@ xwayland_selection_callback(CallbackListPtr *callbacks,
 			    pointer data, pointer args)
 {
     SelectionInfoRec *info = (SelectionInfoRec *) args;
-    struct xwl_screen *xwl_screen = data;
     Selection *selection = info->selection;
 
     switch (info->kind) {