aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winmouse.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-05-30 11:42:37 +0200
committermarha <marha@users.sourceforge.net>2011-05-30 11:42:37 +0200
commit5719b20f6566d6df13010c106630e8448384d688 (patch)
tree1cd7e8509f0cd34bee69044d12b8855d859b9f31 /xorg-server/hw/xwin/winmouse.c
parent87d1238786c12499ac27e9daef4d157e7250d2cb (diff)
downloadvcxsrv-5719b20f6566d6df13010c106630e8448384d688.tar.gz
vcxsrv-5719b20f6566d6df13010c106630e8448384d688.tar.bz2
vcxsrv-5719b20f6566d6df13010c106630e8448384d688.zip
Solved merge problem
Diffstat (limited to 'xorg-server/hw/xwin/winmouse.c')
-rw-r--r--xorg-server/hw/xwin/winmouse.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c
index 6d2e43f07..efe71103c 100644
--- a/xorg-server/hw/xwin/winmouse.c
+++ b/xorg-server/hw/xwin/winmouse.c
@@ -250,12 +250,7 @@ winMouseButtonsSendEvent (int iEventType, int iButton)
QueuePointerEvents(g_pwinPointer, iEventType, iButton,
POINTER_RELATIVE, &mask);
-#if CYGDEBUG
- ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d, nEvents %d\n",
- iEventType, iButton, nevents);
winDebug("winMouseButtonsSendEvent: iEventType: %d, iButton: %d\n",
-#if CYGDEBUG
- ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d\n",
iEventType, iButton);
}