blueness 15/04/28 10:30:45 Modified: 040_all_remove_define_abs.patch Log: Fix removal of macro definition of abs(). Bug #510770.
Revision Changes Path 1.2 src/patchsets/texlive/2013/texlive-core/040_all_remove_define_abs.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2013/texlive-core/040_all_remove_define_abs.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2013/texlive-core/040_all_remove_define_abs.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2013/texlive-core/040_all_remove_define_abs.patch?r1=1.1&r2=1.2 Index: 040_all_remove_define_abs.patch =================================================================== RCS file: /var/cvsroot/gentoo/src/patchsets/texlive/2013/texlive-core/040_all_remove_define_abs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 040_all_remove_define_abs.patch 28 Feb 2015 17:14:22 -0000 1.1 +++ 040_all_remove_define_abs.patch 28 Apr 2015 10:30:45 -0000 1.2 @@ -5,19 +5,22 @@ if f2c.h is included before stdlib.h, then then macro breaks the function prototype. -We just remove it. See +See https://bugs.gentoo.org/show_bug.cgi?id=510770 +Signed-off-by: Felix Janda <[email protected]> Signed-off-by: Anthony G. Basile <[email protected]> --- utils/pmx/pmx-2.7.0/libf2c/f2c.h.orig 2013-01-18 02:59:22.000000000 -0500 +++ utils/pmx/pmx-2.7.0/libf2c/f2c.h 2015-02-28 12:13:56.352201310 -0500 -@@ -162,7 +162,6 @@ +@@ -162,7 +162,7 @@ }; typedef struct Namelist Namelist; -#define abs(x) ((x) >= 0 ? (x) : -(x)) - #define dabs(x) (doublereal)abs(x) +-#define dabs(x) (doublereal)abs(x) ++extern int abs(int x); ++#define dabs(x) ((doublereal)((x) >= 0 ? (x) : -(x))) #undef min #undef max
