brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xwayland: Fix XIOErrorExitHandler warning

Browse Source 
The XIOErrorExitHandler expects (Display *, void *) whereas mutter uses
(Display *, MetaX11Display *).

That causes a warning at build time:

  warning: passing argument 2 of ‘XSetIOErrorExitHandler’ from
           incompatible pointer type [-Wincompatible-pointer-types]
    813 |   XSetIOErrorExitHandler (xdisplay, x_io_error_exit, display);

Actually, the MetaX11Display is not even used, so we can just use the
expected API and ignore the value.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1621>
This commit is contained in:
Olivier Fourdan 2020-12-02 16:29:06 +01:00 committed by Marge Bot
parent c5ad7fe2b4
commit 79d4d7a4ff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wayland/meta-xwayland.c
View File

@ -336,8 +336,8 @@ x_io_error (Display *display)
#ifdef HAVE_XSETIOERROREXITHANDLER #ifdef HAVE_XSETIOERROREXITHANDLER
static void static void
x_io_error_exit (Display *display, x_io_error_exit (Display *display,
MetaX11Display *x11_display) void *data)
{ {
MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default (); MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
MetaXWaylandManager *manager = &compositor->xwayland_manager; MetaXWaylandManager *manager = &compositor->xwayland_manager;