frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Cleaned up some casting to get rid of compiler warnings 

(cherry picked from commit 6f1c85b96550adf0bc34efb6ca649b87bcc1b18c)
This commit is contained in:
Jeremy Huddleston 2008-04-18 20:38:31 -07:00
parent 6550078b09
commit d13828797f
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/xquartz/darwin.c
View File

@ -335,11 +335,8 @@ static void DarwinChangePointerControl(
* DarwinMouseProc * DarwinMouseProc
* Handle the initialization, etc. of a mouse * Handle the initialization, etc. of a mouse
*/ */
static int DarwinMouseProc( static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {
DeviceIntPtr pPointer, CARD8 map[8] = {0, 1, 2, 3, 4, 5, 6, 7};
int what )
{
CARD8 map[8] = {0, 1, 2, 3, 4, 5, 6, 7};
switch (what) { switch (what) {
@ -347,11 +344,11 @@ static int DarwinMouseProc(
pPointer->public.on = FALSE; pPointer->public.on = FALSE;
// Set button map. // Set button map.
InitPointerDeviceStruct( (DevicePtr)pPointer, map, 7, InitPointerDeviceStruct((DevicePtr)pPointer, map, 7,
GetMotionHistory, GetMotionHistory,
(PtrCtrlProcPtr)NoopDDA, (PtrCtrlProcPtr)NoopDDA,
GetMotionHistorySize(), 7); GetMotionHistorySize(), 7);
InitProximityClassDeviceStruct( (DevicePtr)pPointer); InitProximityClassDeviceStruct(pPointer);
break; break;
case DEVICE_ON: case DEVICE_ON:
@ -362,7 +359,7 @@ static int DarwinMouseProc(
case DEVICE_CLOSE: case DEVICE_CLOSE:
case DEVICE_OFF: case DEVICE_OFF:
pPointer->public.on = FALSE; pPointer->public.on = FALSE;
RemoveEnabledDevice( darwinEventReadFD ); RemoveEnabledDevice(darwinEventReadFD);
return Success; return Success;
} }