summaryrefslogtreecommitdiff
path: root/x11-libs/cairo/files/cairo-1.10.2-interix.patch
blob: 3333e3ee52567b5ba2840f172bd721f486b0b952 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
commit 95f6f7a174ca096a3d3dbe84ff220d166d1e2baa
Author: Uli Schlachter <psychon@znc.in>
Date:   Fri Oct 22 11:54:57 2010 +0200

    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 <psychon@znc.in>
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

diff --git a/src/cairoint.h b/src/cairoint.h
index 53c87e5..539d92e 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