diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-01-23 00:47:38 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 05:07:49 +0100 |
| commit | 485d626769c53c7d72ffad2f4e8623d6ce897662 (patch) | |
| tree | ece8a3df05c586f6782d871fe5a5c9c4617d70f1 /nx-X11/programs/Xserver/dix/devices.c | |
| parent | 2853ab292345ef5d1c690289f9d55a0ccdf32450 (diff) | |
| download | nx-libs-485d626769c53c7d72ffad2f4e8623d6ce897662.tar.gz nx-libs-485d626769c53c7d72ffad2f4e8623d6ce897662.tar.bz2 nx-libs-485d626769c53c7d72ffad2f4e8623d6ce897662.zip | |
Lift dix to xorg-xserver-1.3.0.0 state
Diffstat (limited to 'nx-X11/programs/Xserver/dix/devices.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/devices.c | 41 |
1 files changed, 3 insertions, 38 deletions
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index b93a40d97..1c7572d64 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -74,7 +74,7 @@ SOFTWARE. #include "dixevents.h" DeviceIntPtr -_AddInputDevice(DeviceProc deviceProc, Bool autoStart) +AddInputDevice(DeviceProc deviceProc, Bool autoStart) { register DeviceIntPtr dev; @@ -348,7 +348,7 @@ NumMotionEvents() } void -_RegisterPointerDevice(DeviceIntPtr device) +RegisterPointerDevice(DeviceIntPtr device) { inputInfo.pointer = device; #ifdef XKB @@ -371,7 +371,7 @@ _RegisterPointerDevice(DeviceIntPtr device) } void -_RegisterKeyboardDevice(DeviceIntPtr device) +RegisterKeyboardDevice(DeviceIntPtr device) { inputInfo.keyboard = device; #ifdef XKB @@ -1611,38 +1611,3 @@ ProcQueryKeymap(ClientPtr client) WriteReplyToClient(client, sizeof(xQueryKeymapReply), &rep); return Success; } - -/****************************************************************************** - * The following entrypoints are provided for binary compatibility with - * previous versions (they make casts, where the current version changes types - * for more stringent prototype checking). - ******************************************************************************/ -#ifdef AddInputDevice -#undef AddInputDevice - -DevicePtr -AddInputDevice(DeviceProc deviceProc, Bool autoStart) -{ - return (DevicePtr)_AddInputDevice(deviceProc, autoStart); -} -#endif /* AddInputDevice */ - -#ifdef RegisterPointerDevice -#undef RegisterPointerDevice - -void -RegisterPointerDevice(DevicePtr device) -{ - _RegisterPointerDevice((DeviceIntPtr)device); -} -#endif /* RegisterPointerDevice */ - -#ifdef RegisterKeyboardDevice -#undef RegisterKeyboardDevice - -void -RegisterKeyboardDevice(DevicePtr device) -{ - _RegisterKeyboardDevice((DeviceIntPtr)device); -} -#endif /* RegisterKeyboardDevice */ |