Compile fixes for 1.12

7 files changed, 32 insertions, 33 deletions

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 88f408933..477159e0c 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1913,6 +1913,7 @@ DeliverTouchEvents(DeviceIntPtr dev, TouchPointInfoPtr ti,
 
     if (ti->emulate_pointer)
         UpdateDeviceState(dev, &ev->device_event);
+}
 
 void
 SetDeviceRedirectWindow(DeviceIntPtr dev, WindowPtr window)
@@ -1920,7 +1921,7 @@ SetDeviceRedirectWindow(DeviceIntPtr dev, WindowPtr window)
     SpritePtr pSprite = dev->spriteInfo->sprite;
     DeviceIntPtr mouse;
 
-    mouse = (IsMaster(dev) || dev->u.master) ? GetMaster(dev, MASTER_POINTER) : dev;
+    mouse = IsMaster(dev) ? GetMaster(dev, MASTER_POINTER) : dev;
 
     pSprite->redirectWindow = window;
 
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index f79f7af92..3cc3acd57 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -894,8 +894,6 @@ InitInput(int argc, char **argv)
 
     mieqInit();
 
-    GetEventList(&xf86Events);
-
     if (xorgWayland)
 	return;
 
diff --git a/hw/xfree86/xwayland/xwayland-cursor.c b/hw/xfree86/xwayland/xwayland-cursor.c
index 4bf316ace..827c59c0c 100644
--- a/hw/xfree86/xwayland/xwayland-cursor.c
+++ b/hw/xfree86/xwayland/xwayland-cursor.c
@@ -159,11 +159,11 @@ xwl_set_cursor(DeviceIntPtr device,
 
     xwl_screen = xwl_screen_get(screen);
 
-    if (!xwl_screen || list_is_empty(&xwl_screen->input_device_list))
+    if (!xwl_screen || xorg_list_is_empty(&xwl_screen->input_device_list))
 	return ;
 
-    xwl_input_device = list_first_entry(&xwl_screen->input_device_list,
-					struct xwl_input_device, link);
+    xwl_input_device = xorg_list_first_entry(&xwl_screen->input_device_list,
+					     struct xwl_input_device, link);
 
     buffer = dixGetPrivate(&cursor->devPrivates, &xwl_cursor_private_key);
 
diff --git a/hw/xfree86/xwayland/xwayland-input.c b/hw/xfree86/xwayland/xwayland-input.c
index 35b8eec77..6ccc097ff 100644
--- a/hw/xfree86/xwayland/xwayland-input.c
+++ b/hw/xfree86/xwayland/xwayland-input.c
@@ -412,7 +412,7 @@ create_input_device(struct xwl_screen *xwl_screen, uint32_t id,
     }
 
     xwl_input_device->xwl_screen = xwl_screen;
-    list_add(&xwl_input_device->link, &xwl_screen->input_device_list);
+    xorg_list_add(&xwl_input_device->link, &xwl_screen->input_device_list);
 
     xwl_input_device->pointer =
 	device_added(xwl_input_device, "xwayland-pointer");
diff --git a/hw/xfree86/xwayland/xwayland-private.h b/hw/xfree86/xwayland/xwayland-private.h
index 47cdd6347..87362f629 100644
--- a/hw/xfree86/xwayland/xwayland-private.h
+++ b/hw/xfree86/xwayland/xwayland-private.h
@@ -32,8 +32,8 @@ struct xwl_window {
     struct wl_buffer		*buffer;
     WindowPtr			 window;
     DamagePtr			 damage;
-    struct list			 link;
-    struct list			 link_damage;
+    struct xorg_list		 link;
+    struct xorg_list		 link_damage;
 };
 
 struct xwl_output;
@@ -57,9 +57,9 @@ struct xwl_screen {
     uint32_t			 flags;
     char			*device_name;
     uint32_t			 authenticated;
-    struct list			 input_device_list;
-    struct list			 damage_window_list;
-    struct list			 window_list;
+    struct xorg_list		 input_device_list;
+    struct xorg_list		 damage_window_list;
+    struct xorg_list		 window_list;
 
     /* FIXME: Hack. */
     int32_t			 width, height;
@@ -97,7 +97,7 @@ struct xwl_input_device {
     uint32_t			 id;
     uint32_t			 modifiers;
     uint32_t			 time;
-    struct list			 link;
+    struct xorg_list		 link;
 };
 
 struct xwl_screen *xwl_screen_get(ScreenPtr screen);
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
index fcda2f2f8..e58350feb 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -151,7 +151,7 @@ damage_report(DamagePtr pDamage, RegionPtr pRegion, void *data)
     struct xwl_window *xwl_window = data;
     struct xwl_screen *xwl_screen = xwl_window->xwl_screen;
 
-    list_add(&xwl_window->link_damage, &xwl_screen->damage_window_list);
+    xorg_list_add(&xwl_window->link_damage, &xwl_screen->damage_window_list);
 }
 
 static void
@@ -207,8 +207,8 @@ xwl_realize_window(WindowPtr window)
 		     FALSE, screen, xwl_window);
     DamageRegister(&window->drawable, xwl_window->damage);
 
-    list_add(&xwl_window->link, &xwl_screen->window_list);
-    list_init(&xwl_window->link_damage);
+    xorg_list_add(&xwl_window->link, &xwl_screen->window_list);
+    xorg_list_init(&xwl_window->link_damage);
 
     return ret;
 }
@@ -224,8 +224,8 @@ xwl_unrealize_window(WindowPtr window)
 
     xwl_screen = xwl_screen_get(screen);
 
-    list_for_each_entry(xwl_input_device,
-			&xwl_screen->input_device_list, link) {
+    xorg_list_for_each_entry(xwl_input_device,
+			     &xwl_screen->input_device_list, link) {
 	if (!xwl_input_device->focus_window)
 	    continue ;
 	if (xwl_input_device->focus_window->window == window) {
@@ -247,8 +247,8 @@ xwl_unrealize_window(WindowPtr window)
     if (xwl_window->buffer)
 	wl_buffer_destroy(xwl_window->buffer);
     wl_surface_destroy(xwl_window->surface);
-    list_del(&xwl_window->link);
-    list_del(&xwl_window->link_damage);
+    xorg_list_del(&xwl_window->link);
+    xorg_list_del(&xwl_window->link_damage);
     DamageUnregister(&window->drawable, xwl_window->damage);
     DamageDestroy(xwl_window->damage);
     free(xwl_window);
diff --git a/hw/xfree86/xwayland/xwayland.c b/hw/xfree86/xwayland/xwayland.c
index 5d053aa08..829b4c251 100644
--- a/hw/xfree86/xwayland/xwayland.c
+++ b/hw/xfree86/xwayland/xwayland.c
@@ -230,9 +230,9 @@ xwl_screen_pre_init(ScrnInfoPtr scrninfo,
 	return NULL;
     }
 
-    list_init(&xwl_screen->input_device_list);
-    list_init(&xwl_screen->damage_window_list);
-    list_init(&xwl_screen->window_list);
+    xorg_list_init(&xwl_screen->input_device_list);
+    xorg_list_init(&xwl_screen->damage_window_list);
+    xorg_list_init(&xwl_screen->window_list);
     xwl_screen->scrninfo = scrninfo;
     xwl_screen->driver = driver;
     xwl_screen->flags = flags;
@@ -307,22 +307,22 @@ void xwl_screen_close(struct xwl_screen *xwl_screen)
 					  xwl_screen->input_listener);
 
 
-    list_for_each_entry_safe(xwl_input_device, itmp,
-			     &xwl_screen->input_device_list, link) {
+    xorg_list_for_each_entry_safe(xwl_input_device, itmp,
+				  &xwl_screen->input_device_list, link) {
 	wl_input_device_destroy(xwl_input_device->input_device);
 	free(xwl_input_device);
     }
-    list_for_each_entry_safe(xwl_window, wtmp,
-			     &xwl_screen->window_list, link) {
+    xorg_list_for_each_entry_safe(xwl_window, wtmp,
+				  &xwl_screen->window_list, link) {
 	wl_buffer_destroy(xwl_window->buffer);
 	wl_surface_destroy(xwl_window->surface);
 	free(xwl_window);
     }
 
     xwl_screen->input_listener = NULL;
-    list_init(&xwl_screen->input_device_list);
-    list_init(&xwl_screen->damage_window_list);
-    list_init(&xwl_screen->window_list);
+    xorg_list_init(&xwl_screen->input_device_list);
+    xorg_list_init(&xwl_screen->damage_window_list);
+    xorg_list_init(&xwl_screen->window_list);
     xwl_screen->root_x = 0;
     xwl_screen->root_y = 0;
 
@@ -348,8 +348,8 @@ void xwl_screen_post_damage(struct xwl_screen *xwl_screen)
     BoxPtr box;
     int count, i;
 
-    list_for_each_entry(xwl_window, &xwl_screen->damage_window_list,
-			link_damage) {
+    xorg_list_for_each_entry(xwl_window, &xwl_screen->damage_window_list,
+			     link_damage) {
 
 	region = DamageRegion(xwl_window->damage);
 	count = RegionNumRects(region);
@@ -363,7 +363,7 @@ void xwl_screen_post_damage(struct xwl_screen *xwl_screen)
 	DamageEmpty(xwl_window->damage);
     }
 
-    list_init(&xwl_screen->damage_window_list);
+    xorg_list_init(&xwl_screen->damage_window_list);
 }
 
 static pointer