diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-22 15:42:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-22 15:42:49 +0200 |
| commit | 46d4f558531910ca1f3297da85b99334d6de2921 (patch) | |
| tree | 60c37077eb160948fe317a17ec4c19bef679aa35 /xorg-server/mi/mifpoly.h | |
| parent | 0bf6df93b9fdbb7902bf1014d605c6876a3ad035 (diff) | |
| parent | c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983 (diff) | |
| download | vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.tar.gz vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.tar.bz2 vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/dpms.c
xorg-server/Xext/saver.c
xorg-server/Xext/security.c
xorg-server/Xext/shape.c
xorg-server/Xext/sync.c
xorg-server/Xi/opendev.c
xorg-server/fb/wfbrename.h
xorg-server/glx/glxserver.h
xorg-server/hw/xwin/winwindowswm.c
xorg-server/mi/miarc.c
xorg-server/mi/miwideline.c
xorg-server/os/io.c
xorg-server/render/mipict.c
Diffstat (limited to 'xorg-server/mi/mifpoly.h')
| -rw-r--r-- | xorg-server/mi/mifpoly.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/mi/mifpoly.h b/xorg-server/mi/mifpoly.h index ffd19a341..cc779c946 100644 --- a/xorg-server/mi/mifpoly.h +++ b/xorg-server/mi/mifpoly.h @@ -51,12 +51,12 @@ SOFTWARE. #include <X11/Xfuncproto.h> #define EPSILON 0.000001 -#define ISEQUAL(a,b) (Fabs((a) - (b)) <= EPSILON) -#define UNEQUAL(a,b) (Fabs((a) - (b)) > EPSILON) +#define ISEQUAL(a,b) (fabs((a) - (b)) <= EPSILON) +#define UNEQUAL(a,b) (fabs((a) - (b)) > EPSILON) #define WITHINHALF(a, b) (((a) - (b) > 0.0) ? (a) - (b) < 0.5 : \ (b) - (a) <= 0.5) #define ROUNDTOINT(x) ((int) (((x) > 0.0) ? ((x) + 0.5) : ((x) - 0.5))) -#define ISZERO(x) (Fabs((x)) <= EPSILON) +#define ISZERO(x) (fabs((x)) <= EPSILON) #define PTISEQUAL(a,b) (ISEQUAL(a.x,b.x) && ISEQUAL(a.y,b.y)) #define PTUNEQUAL(a,b) (UNEQUAL(a.x,b.x) || UNEQUAL(a.y,b.y)) #define PtEqual(a, b) (((a).x == (b).x) && ((a).y == (b).y)) |