diff options
author | Alexandr Shadchin <Alexandr.Shadchin@gmail.com> | 2011-03-09 20:09:59 +0500 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-03-10 08:31:19 +1000 |
commit | a22879c6779283684fe4a61543fc95179b4f5d0b (patch) | |
tree | 1407dcaf38ceec44a1087696ca9468f5d9aadc90 /src/mouse.h | |
parent | 2e507df6704ebd2cab6ada450ed40d89a2d3ca19 (diff) | |
download | xorg-driver-xf86-input-mouse-a22879c6779283684fe4a61543fc95179b4f5d0b.tar.gz |
Fix BSD issues with new ABI12 init process.
From Bug 34794:
"Until xf86-input-mouse-1.6.0, the MousePreInit() function exited if an
os specific PreInit function existed. It let the os-specific function finish
all initialisations that remained to be done after osInfo->PreInit() was
called.
The code in master now continues, and does things that the bsdMousePreInit()
function in bsd_mouse.c doesn't expect."
Fix up wsconsPreInit to deal with the new init process.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=34794
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/mouse.h')
-rw-r--r-- | src/mouse.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mouse.h b/src/mouse.h index 9f5b47e..6e63c54 100644 --- a/src/mouse.h +++ b/src/mouse.h @@ -77,6 +77,7 @@ typedef enum { PROT_BM, PROT_AUTO, PROT_SYSMOUSE, + PROT_WSMOUSE, PROT_NUMPROTOS /* This must always be last. */ } MouseProtocolID; |