|
 |
92c9eb |
From 3c8f243b750a92d5837a449d344ff884dbd02b57 Mon Sep 17 00:00:00 2001
|
|
|
92c9eb |
From: Adam Jackson <ajax@redhat.com>
|
|
|
92c9eb |
Date: Thu, 16 Feb 2017 09:21:21 -0500
|
|
|
92c9eb |
Subject: [PATCH xf86-input-mouse] Adapt to removal of xf86GetOS
|
|
|
92c9eb |
|
|
|
92c9eb |
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
|
92c9eb |
---
|
|
|
92c9eb |
src/mouse.c | 11 +++++------
|
|
|
92c9eb |
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
|
92c9eb |
|
|
|
92c9eb |
diff --git a/src/mouse.c b/src/mouse.c
|
|
|
92c9eb |
index dae98aa..40d97a9 100644
|
|
|
92c9eb |
--- a/src/mouse.c
|
|
|
92c9eb |
+++ b/src/mouse.c
|
|
|
92c9eb |
@@ -794,7 +794,6 @@ InitProtocols(void)
|
|
|
92c9eb |
{
|
|
|
92c9eb |
int classes;
|
|
|
92c9eb |
int i;
|
|
|
92c9eb |
- const char *osname = NULL;
|
|
|
92c9eb |
|
|
|
92c9eb |
if (osInfo)
|
|
|
92c9eb |
return TRUE;
|
|
|
92c9eb |
@@ -821,11 +820,11 @@ InitProtocols(void)
|
|
|
92c9eb |
mouseProtocols[i].id = PROT_UNSUP;
|
|
|
92c9eb |
|
|
|
92c9eb |
/* NetBSD uses PROT_BM for "PS/2". */
|
|
|
92c9eb |
- xf86GetOS(&osname, NULL, NULL, NULL);
|
|
|
92c9eb |
- if (osname && xf86NameCmp(osname, "netbsd") == 0)
|
|
|
92c9eb |
- for (i = 0; mouseProtocols[i].name; i++)
|
|
|
92c9eb |
- if (mouseProtocols[i].id == PROT_PS2)
|
|
|
92c9eb |
- mouseProtocols[i].id = PROT_BM;
|
|
|
92c9eb |
+#if defined(__NetBSD__)
|
|
|
92c9eb |
+ for (i = 0; mouseProtocols[i].name; i++)
|
|
|
92c9eb |
+ if (mouseProtocols[i].id == PROT_PS2)
|
|
|
92c9eb |
+ mouseProtocols[i].id = PROT_BM;
|
|
|
92c9eb |
+#endif
|
|
|
92c9eb |
|
|
|
92c9eb |
return TRUE;
|
|
|
92c9eb |
}
|
|
|
92c9eb |
--
|
|
|
92c9eb |
2.17.1
|
|
|
92c9eb |
|