3c8f243b750a92d5837a449d344ff884dbd02b57.patch 1.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. From 3c8f243b750a92d5837a449d344ff884dbd02b57 Mon Sep 17 00:00:00 2001
  2. From: Adam Jackson <ajax@redhat.com>
  3. Date: Thu, 16 Feb 2017 09:21:21 -0500
  4. Subject: Adapt to removal of xf86GetOS
  5. Signed-off-by: Adam Jackson <ajax@redhat.com>
  6. ---
  7. src/mouse.c | 11 +++++------
  8. 1 file changed, 5 insertions(+), 6 deletions(-)
  9. diff --git a/src/mouse.c b/src/mouse.c
  10. index dae98aa..40d97a9 100644
  11. --- a/src/mouse.c
  12. +++ b/src/mouse.c
  13. @@ -794,7 +794,6 @@ InitProtocols(void)
  14. {
  15. int classes;
  16. int i;
  17. - const char *osname = NULL;
  18. if (osInfo)
  19. return TRUE;
  20. @@ -821,11 +820,11 @@ InitProtocols(void)
  21. mouseProtocols[i].id = PROT_UNSUP;
  22. /* NetBSD uses PROT_BM for "PS/2". */
  23. - xf86GetOS(&osname, NULL, NULL, NULL);
  24. - if (osname && xf86NameCmp(osname, "netbsd") == 0)
  25. - for (i = 0; mouseProtocols[i].name; i++)
  26. - if (mouseProtocols[i].id == PROT_PS2)
  27. - mouseProtocols[i].id = PROT_BM;
  28. +#if defined(__NetBSD__)
  29. + for (i = 0; mouseProtocols[i].name; i++)
  30. + if (mouseProtocols[i].id == PROT_PS2)
  31. + mouseProtocols[i].id = PROT_BM;
  32. +#endif
  33. return TRUE;
  34. }
  35. --
  36. cgit v1.1