xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-present.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2d188c7db1baaf21b42c2e8bccf54c8d5486548
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Mon Oct 8 16:38:01 2018 +0200

    xwayland: keep `xwl_present_timer_callback()` private
    
    `xwl_present_timer_callback()` is initially marked a private and later
    implemented as public.
    
    Let's keep that private, shall we.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c
index 316e04443..98692b3ca 100644
--- a/hw/xwayland/xwayland-present.c
+++ b/hw/xwayland/xwayland-present.c
@@ -210,7 +210,7 @@ xwl_present_events_notify(struct xwl_present_window *xwl_present_window)
     }
 }
 
-CARD32
+static CARD32
 xwl_present_timer_callback(OsTimerPtr timer,
                            CARD32 time,
                            void *arg)