From: | "Anthony G. Basile (blueness)" <blueness@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo commit in src/patchsets/texlive/2014/texlive-core: 040_all_remove_define_abs.patch |
Date: | Tue, 28 Apr 2015 14:35:17 |
Message-Id: | 20150428103047.DDEBB978@oystercatcher.gentoo.org |
1 | blueness 15/04/28 10:30:45 |
2 | |
3 | Modified: 040_all_remove_define_abs.patch |
4 | Log: |
5 | Fix removal of macro definition of abs(). Bug #510770. |
6 | |
7 | Revision Changes Path |
8 | 1.2 src/patchsets/texlive/2014/texlive-core/040_all_remove_define_abs.patch |
9 | |
10 | file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2014/texlive-core/040_all_remove_define_abs.patch?rev=1.2&view=markup |
11 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2014/texlive-core/040_all_remove_define_abs.patch?rev=1.2&content-type=text/plain |
12 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2014/texlive-core/040_all_remove_define_abs.patch?r1=1.1&r2=1.2 |
13 | |
14 | Index: 040_all_remove_define_abs.patch |
15 | =================================================================== |
16 | RCS file: /var/cvsroot/gentoo/src/patchsets/texlive/2014/texlive-core/040_all_remove_define_abs.patch,v |
17 | retrieving revision 1.1 |
18 | retrieving revision 1.2 |
19 | diff -u -r1.1 -r1.2 |
20 | --- 040_all_remove_define_abs.patch 28 Feb 2015 17:34:24 -0000 1.1 |
21 | +++ 040_all_remove_define_abs.patch 28 Apr 2015 10:30:45 -0000 1.2 |
22 | @@ -5,19 +5,22 @@ |
23 | if f2c.h is included before stdlib.h, then then macro breaks the function |
24 | prototype. |
25 | |
26 | -We just remove it. See |
27 | +See |
28 | |
29 | https://bugs.gentoo.org/show_bug.cgi?id=510770 |
30 | |
31 | +Signed-off-by: Felix Janda <felix.janda@××××××.de> |
32 | Signed-off-by: Anthony G. Basile <blueness@g.o> |
33 | |
34 | --- utils/pmx/pmx-2.7.0/libf2c/f2c.h.orig 2013-01-18 02:59:22.000000000 -0500 |
35 | +++ utils/pmx/pmx-2.7.0/libf2c/f2c.h 2015-02-28 12:13:56.352201310 -0500 |
36 | -@@ -162,7 +162,6 @@ |
37 | +@@ -162,7 +162,7 @@ |
38 | }; |
39 | typedef struct Namelist Namelist; |
40 | |
41 | -#define abs(x) ((x) >= 0 ? (x) : -(x)) |
42 | - #define dabs(x) (doublereal)abs(x) |
43 | +-#define dabs(x) (doublereal)abs(x) |
44 | ++extern int abs(int x); |
45 | ++#define dabs(x) ((doublereal)((x) >= 0 ? (x) : -(x))) |
46 | #undef min |
47 | #undef max |