SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge XFree86 4.3.0.1 to -CURRENT

Browse Source
This commit is contained in:
Kaleb Keithley
2003-11-17 19:03:47 +00:00
parent 9508a382f8
commit c57959ad6a
615 changed files with 42990 additions and 101132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Xi/setbmap.c
View File

@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
/* $XFree86: xc/programs/Xserver/Xi/setbmap.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
/***********************************************************************
*
@@ -62,12 +63,12 @@ SOFTWARE.
#include "inputstr.h" /* DeviceIntPtr */
#include "XI.h"
#include "XIproto.h"
#include "exevents.h"
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
extern int IReqCode;
extern int BadDevice;
extern int DeviceMappingNotify;
extern void (* ReplySwapVector[256]) ();
DeviceIntPtr LookupDeviceIntRec();
#include "setbmap.h"
/***********************************************************************
*
@@ -92,6 +93,7 @@ SProcXSetDeviceButtonMapping(client)
*
*/
int
ProcXSetDeviceButtonMapping (client)
register ClientPtr client;
{
@@ -124,7 +126,7 @@ ProcXSetDeviceButtonMapping (client)
return Success;
}
ret = SetButtonMapping (client, dev, stuff->map_length, &stuff[1]);
ret = SetButtonMapping (client, dev, stuff->map_length, (BYTE *)&stuff[1]);
if (ret == BadValue || ret == BadMatch)
{
@@ -150,6 +152,7 @@ ProcXSetDeviceButtonMapping (client)
*
*/
void
SRepXSetDeviceButtonMapping (client, size, rep)
ClientPtr client;
int size;