File U_adapt-to-removal-of-xf86GetOS.patch of Package xf86-input-mouse

Overview Repositories Revisions Requests Users Attributes Meta

File U_adapt-to-removal-of-xf86GetOS.patch of Package xf86-input-mouse (Revision 09732fa6f8a974513c6680078e2be625)

Currently displaying revision 09732fa6f8a974513c6680078e2be625 , Show latest

From 3c8f243b750a92d5837a449d344ff884dbd02b57 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 16 Feb 2017 09:21:21 -0500
Subject: Adapt to removal of xf86GetOS

Signed-off-by: Adam Jackson <ajax@redhat.com>

diff --git a/src/mouse.c b/src/mouse.c
index dae98aa..40d97a9 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -794,7 +794,6 @@ InitProtocols(void)
 {
     int classes;
     int i;
-    const char *osname = NULL;
 
     if (osInfo)
         return TRUE;
@@ -821,11 +820,11 @@ InitProtocols(void)
                 mouseProtocols[i].id = PROT_UNSUP;
 
     /* NetBSD uses PROT_BM for "PS/2". */
-    xf86GetOS(&osname, NULL, NULL, NULL);
-    if (osname && xf86NameCmp(osname, "netbsd") == 0)
-        for (i = 0; mouseProtocols[i].name; i++)
-            if (mouseProtocols[i].id == PROT_PS2)
-                mouseProtocols[i].id = PROT_BM;
+#if defined(__NetBSD__)
+    for (i = 0; mouseProtocols[i].name; i++)
+        if (mouseProtocols[i].id == PROT_PS2)
+            mouseProtocols[i].id = PROT_BM;
+#endif
 
     return TRUE;
 }
-- 
cgit v0.10.2

Places

File U_adapt-to-removal-of-xf86GetOS.patch of Package xf86-input-mouse (Revision 09732fa6f8a974513c6680078e2be625)

Places