aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/test/xi2
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-06 10:36:17 +0200
committermarha <marha@users.sourceforge.net>2011-06-06 10:36:17 +0200
commit336e4aab196609a528213e9ecebcb30fce7aa654 (patch)
treec8a72cf42c0bbe281dffdac04d60e758aeea345f /xorg-server/test/xi2
parent097c0d8400d976c5c372db576a11764e87994c7f (diff)
parent416761431e76dcb053fa3447b6d53051579dad0a (diff)
downloadvcxsrv-336e4aab196609a528213e9ecebcb30fce7aa654.tar.gz
vcxsrv-336e4aab196609a528213e9ecebcb30fce7aa654.tar.bz2
vcxsrv-336e4aab196609a528213e9ecebcb30fce7aa654.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/test/xi2/protocol-common.c xorg-server/xkb/xkbfmisc.c
Diffstat (limited to 'xorg-server/test/xi2')
-rw-r--r--xorg-server/test/xi2/protocol-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/test/xi2/protocol-common.c b/xorg-server/test/xi2/protocol-common.c
index a414ad1fb..b6909f925 100644
--- a/xorg-server/test/xi2/protocol-common.c
+++ b/xorg-server/test/xi2/protocol-common.c
@@ -121,7 +121,7 @@ ClientRec init_client(int len, void *data)
void init_window(WindowPtr window, WindowPtr parent, int id)
{
- memset(window, 0, sizeof(window));
+ memset(window, 0, sizeof(*window));
window->drawable.id = id;
if (parent)