diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2018-07-12 14:44:42 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2018-07-12 14:44:42 +0000 |
| commit | 18886ea446399a1ac2ef6f01733a199a24695632 (patch) | |
| tree | 7c44f4700ef2fa5cc22009c306efd290be0bc478 /driver/xf86-input-mouse/src | |
| parent | 11d7a64ec0a37a15ab02613052e82bb6b39335ae (diff) | |
Update to xf86-input-mouse 1.9.3
Diffstat (limited to 'driver/xf86-input-mouse/src')
| -rw-r--r-- | driver/xf86-input-mouse/src/bsd_mouse.c | 2 | ||||
| -rw-r--r-- | driver/xf86-input-mouse/src/mouse.c | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/driver/xf86-input-mouse/src/bsd_mouse.c b/driver/xf86-input-mouse/src/bsd_mouse.c index 054fecbe4..5419182dc 100644 --- a/driver/xf86-input-mouse/src/bsd_mouse.c +++ b/driver/xf86-input-mouse/src/bsd_mouse.c @@ -563,8 +563,10 @@ usbMouseProc(DeviceIntPtr pPointer, int what) pInfo->fd = -1; } else { xf86FlushInput(pInfo->fd); +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 23 if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput, pInfo)) +#endif AddEnabledDevice(pInfo->fd); } } diff --git a/driver/xf86-input-mouse/src/mouse.c b/driver/xf86-input-mouse/src/mouse.c index dae98aaf4..40d97a9e6 100644 --- a/driver/xf86-input-mouse/src/mouse.c +++ b/driver/xf86-input-mouse/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; } |