diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
| commit | cb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch) | |
| tree | 8b4e9e320258d5280ce454163c49363030626c1a /libX11/src/GetPntMap.c | |
| parent | 213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff) | |
| parent | c87efef42f76c2ff0dcfad2842ab369beffd21de (diff) | |
| download | vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2 vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/src/GetPntMap.c')
| -rw-r--r-- | libX11/src/GetPntMap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libX11/src/GetPntMap.c b/libX11/src/GetPntMap.c index 426c9ac9d..f3446354e 100644 --- a/libX11/src/GetPntMap.c +++ b/libX11/src/GetPntMap.c @@ -67,11 +67,11 @@ int XGetPointerMapping ( _XRead (dpy, (char *)mapping, nbytes); /* don't return more data than the user asked for. */ if (rep.nElts) { - memcpy ((char *) map, (char *) mapping, + memcpy ((char *) map, (char *) mapping, MIN((int)rep.nElts, nmaps) ); } - if (remainder) + if (remainder) _XEatData(dpy, (unsigned long)remainder); UnlockDisplay(dpy); |