xorg-server: Changes to 'ubuntu+1'
debian/patches/xmir.patch | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 0568033ae082d13d1bb6f1335f97ac09eac8336d
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Mar 5 16:57:12 2014 +0100
refresh xmir harder
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index bf9b519..d8870de 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -816,7 +816,7 @@
+};
+
+static int
-+xmir_visit_set_window_pixmap(WindowPtr window, pointer data)
++xmir_visit_set_window_pixmap(WindowPtr window, void *data)
+{
+ struct xmir_visit_set_pixmap_window *visit = data;
+
@@ -1147,7 +1147,7 @@
+static int pipefds[2];
+
+static void
-+xmir_wakeup_handler(pointer data, int err, pointer read_mask)
++xmir_wakeup_handler(void *data, int err, void *read_mask)
+{
+ if (err >= 0 && FD_ISSET(pipefds[0], (fd_set *)read_mask))
+ xmir_process_from_eventloop();
@@ -1801,8 +1801,8 @@
+
+_X_EXPORT XF86ModuleData xmirModuleData = { &VersRec, xMirSetup, xMirTeardown };
+
-+static pointer
-+xMirSetup(pointer module, pointer opts, int *errmaj, int *errmin)
++static void *
++xMirSetup(void *module, void *opts, int *errmaj, int *errmin)
+{
+ static Bool setupDone = FALSE;
+
@@ -1830,7 +1830,7 @@
+}
+
+static void
-+xMirTeardown(pointer module)
++xMirTeardown(void *module)
+{
+}
--- /dev/null
Reply to: