From 95f6f7a174ca096a3d3dbe84ff220d166d1e2baa Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Fri, 22 Oct 2010 11:54:57 +0200 Subject: [PATCH] Make both versions of _cairo_lround consistent again Commit c0008242b0f made cairo use libm's lround instead of its own _cairo_lround by default. However, since commit ce58f874 from 2006, _cairo_lround does arithmetic rounding instead of away-from-zero rounding (before said commit, it was using baker's rounding). So to make the rounding of _cairo_lround be independent from DISABLE_SOME_FLOATING_POINT, we have to use another function. Turns out that _cairo_round already does the same thing that _cairo_lround does. Their only difference is the return type. Signed-off-by: Uli Schlachter Signed-off-by: Chris Wilson --- src/cairoint.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cairoint.h b/src/cairoint.h index 53c87e56c..539d92ea5 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -968,7 +968,11 @@ _cairo_round (double r) cairo_private int _cairo_lround (double d) cairo_const; #else -#define _cairo_lround lround +static inline int cairo_const +_cairo_lround (double r) +{ + return _cairo_round (r); +} #endif cairo_private uint16_t