blueness 15/04/28 10:30:45 Modified: 130_all_remove_define_abs.patch Log: Fix removal of macro definition of abs(). Bug #510770.
Revision Changes Path 1.2 src/patchsets/texlive/2012/texlive-core/130_all_remove_define_abs.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2012/texlive-core/130_all_remove_define_abs.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2012/texlive-core/130_all_remove_define_abs.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2012/texlive-core/130_all_remove_define_abs.patch?r1=1.1&r2=1.2 Index: 130_all_remove_define_abs.patch =================================================================== RCS file: /var/cvsroot/gentoo/src/patchsets/texlive/2012/texlive-core/130_all_remove_define_abs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 130_all_remove_define_abs.patch 28 Feb 2015 16:48:16 -0000 1.1 +++ 130_all_remove_define_abs.patch 28 Apr 2015 10:30:45 -0000 1.2 @@ -1,24 +1,28 @@ -utils/pmx/pmx-2.6.18/libf2c/f2c.h: remove unnecesary macro for abs() +utils/pmx/pmx-2.7.0/libf2c/f2c.h: remove unnecesary macro for abs() On POSIX systems, abs() is a function provided by your C Standard library, so we don't need to define it as a macro. It is dangerous to do so because 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]> -diff -Naur texlive-20120701-source.orig/utils/pmx/pmx-2.6.18/libf2c/f2c.h texlive-20120701-source/utils/pmx/pmx-2.6.18/libf2c/f2c.h ---- texlive-20120701-source.orig/utils/pmx/pmx-2.6.18/libf2c/f2c.h 2012-05-20 10:47:27.000000000 +0000 -+++ texlive-20120701-source/utils/pmx/pmx-2.6.18/libf2c/f2c.h 2014-05-15 17:16:37.030402773 +0000 -@@ -157,7 +157,6 @@ +diff -ur a/texlive-20120701-source/utils/pmx/pmx-2.6.18/libf2c/f2c.h b/texlive-20120701-source/utils/pmx/pmx-2.6.18/libf2c/f2c.h +--- a/texlive-20120701-source/utils/pmx/pmx-2.6.18/libf2c/f2c.h 2012-05-20 12:47:27.000000000 -0200 ++++ b/texlive-20120701-source/utils/pmx/pmx-2.6.18/libf2c/f2c.h 2015-04-11 17:10:01.710633750 -0200 +@@ -157,8 +157,8 @@ }; 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))) #define min(a,b) ((a) <= (b) ? (a) : (b)) #define max(a,b) ((a) >= (b) ? (a) : (b)) + #define dmin(a,b) (doublereal)min(a,b)
