diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2011-06-24 14:11:39 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2011-06-27 13:27:17 +0100 |
| commit | fb649060ae10c48d7bee2343119d495de1474ad4 (patch) | |
| tree | c6c9ce38afd4aa4c80557896d7896f5d6bf8b39e /dix/ptrveloc.c | |
| parent | 601504cb32855c90b531265b9da27522a85c978e (diff) | |
| parent | d784fd09dc277610d5f4e98d577c4fdcd9215f9c (diff) | |
Merge commit 'xorg-server-1.10.2' into cygwin-release-1.10xserver-cygwin-1.10.2-1
Conflicts:
configure.ac
glx/Makefile.am
glx/glapi.c
glx/glxext.c
Diffstat (limited to 'dix/ptrveloc.c')
| -rw-r--r-- | dix/ptrveloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c index 8f0332161..4d5dad764 100644 --- a/dix/ptrveloc.c +++ b/dix/ptrveloc.c @@ -392,7 +392,7 @@ DoGetDirection(int dx, int dy){ float r; int i1, i2; /* on insignificant mickeys, flag 135 degrees */ - if(abs(dx) < 2 && abs(dy < 2)){ + if(abs(dx) < 2 && abs(dy) < 2){ /* first check diagonal cases */ if(dx > 0 && dy > 0) return 4+8+16; |