aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-03-10 17:50:22 +0000
committermarha <marha@users.sourceforge.net>2010-03-10 17:50:22 +0000
commited13095ef146649dce4a58c891544d7ff31915c7 (patch)
tree898d0857b15994e76207056dea28a202b23f4978 /xorg-server
parent2af2c9f31121e5b8032fd7c501bca8b98b902bb4 (diff)
downloadvcxsrv-ed13095ef146649dce4a58c891544d7ff31915c7.tar.gz
vcxsrv-ed13095ef146649dce4a58c891544d7ff31915c7.tar.bz2
vcxsrv-ed13095ef146649dce4a58c891544d7ff31915c7.zip
Undid merge changes because they cause compiler warnings.
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/hw/xwin/winkeybd.c2
-rw-r--r--xorg-server/hw/xwin/winmouse.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/hw/xwin/winkeybd.c b/xorg-server/hw/xwin/winkeybd.c
index 03291312f..bbfeba553 100644
--- a/xorg-server/hw/xwin/winkeybd.c
+++ b/xorg-server/hw/xwin/winkeybd.c
@@ -486,7 +486,7 @@ winSendKeyEvent (DWORD dwKey, Bool fDown)
nevents = GetKeyboardEvents(events, g_pwinKeyboard, fDown ? KeyPress : KeyRelease, dwKey + MIN_KEYCODE);
for (i = 0; i < nevents; i++)
- mieqEnqueue(g_pwinKeyboard, events[i].event);
+ mieqEnqueue(g_pwinKeyboard, (InternalEvent*)events[i].event);
winDebug("winSendKeyEvent: dwKey: %d, fDown: %d, nEvents %d\n",
dwKey, fDown, nevents);
diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c
index aad021a00..e150247db 100644
--- a/xorg-server/hw/xwin/winmouse.c
+++ b/xorg-server/hw/xwin/winmouse.c
@@ -250,7 +250,7 @@ winMouseButtonsSendEvent (int iEventType, int iButton)
POINTER_RELATIVE, 0, 0, NULL);
for (i = 0; i < nevents; i++)
- mieqEnqueue(g_pwinPointer, events[i].event);
+ mieqEnqueue(g_pwinPointer, (InternalEvent*)events[i].event);
winDebug("winMouseButtonsSendEvent: iEventType: %d, iButton: %d, nEvents %d\n",
iEventType, iButton, nevents);
@@ -381,5 +381,5 @@ void winEnqueueMotion(int x, int y)
POINTER_ABSOLUTE | POINTER_SCREEN, 0, 2, valuators);
for (i = 0; i < nevents; i++)
- mieqEnqueue(g_pwinPointer, events[i].event);
+ mieqEnqueue(g_pwinPointer, (InternalEvent*)events[i].event);
}