diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-10-25 01:07:36 +0300 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-10-25 01:07:36 +0300 |
| commit | 11fb58be77ac163844e494b2b0a260cf28a7ecd1 (patch) | |
| tree | d668a398981535a8d140fa2de3c27e4147933fe5 | |
| parent | 2a74b8a91da1a98669993078f7fe9081f2d743ce (diff) | |
miscellaneous warning fixes
Use the correct type for time, and fix the mi prototype of EnqueueEvent.
| -rw-r--r-- | dix/getevents.c | 6 | ||||
| -rw-r--r-- | mi/mipointer.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index 17a8cb47b..bec3c3b2e 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -117,7 +117,8 @@ _X_EXPORT int GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type, int key_code, int first_valuator, int num_valuators, int *valuators) { - int numEvents = 0, ms = 0, i = 0; + int numEvents = 0, i = 0; + CARD32 ms = 0; int final_valuator = first_valuator + num_valuators; KeySym sym = pDev->key->curKeySyms.map[key_code * pDev->key->curKeySyms.mapWidth]; @@ -378,7 +379,8 @@ _X_EXPORT int GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, int flags, int first_valuator, int num_valuators, int *valuators) { - int num_events = 0, ms = 0, final_valuator = 0; + int num_events = 0, final_valuator = 0; + CARD32 ms = 0; deviceKeyButtonPointer *kbp = NULL; Bool sendValuators = (type == MotionNotify || flags & POINTER_ABSOLUTE); DeviceIntPtr cp = inputInfo.pointer; diff --git a/mi/mipointer.h b/mi/mipointer.h index 82ff045d6..21b55fac7 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -73,6 +73,7 @@ typedef struct _miPointerScreenFuncRec { int /* y */ ); void (*EnqueueEvent)( + DeviceIntPtr /* pDev */, xEventPtr /* event */ ); void (*NewEventScreen)( |