1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-16 03:24:07 +00:00

Remove fabs() hack. This header gets installed and breaks some IM users.

Submitted by:	antoine@
This commit is contained in:
Koop Mast 2014-12-21 17:36:55 +00:00
parent 1247417923
commit 40c8dedfc2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=375170

View File

@ -1,58 +0,0 @@
--- magick/magick-type.h.orig 2014-08-08 16:27:39.000000000 +0200
+++ magick/magick-type.h 2014-12-19 17:31:35.000000000 +0100
@@ -45,12 +45,16 @@ extern "C" {
*/
#if MAGICKCORE_SIZEOF_FLOAT_T == 0
typedef float MagickRealType;
+#define fabs fabsf
#elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_FLOAT)
typedef float MagickRealType;
+#define fabs fabsf
#elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_DOUBLE)
typedef double MagickRealType;
+#define fabs fabs
#elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_LONG_DOUBLE)
typedef long double MagickRealType;
+#define fabs fabsl
#else
# error Your float_t type is neither a float, nor a double, nor a long double
#endif
@@ -74,12 +78,16 @@ typedef unsigned char Quantum;
*/
#if MAGICKCORE_SIZEOF_FLOAT_T == 0
typedef float MagickRealType;
+#define fabs fabsf
#elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_FLOAT)
typedef float MagickRealType;
+#define fabs fabsf
#elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_DOUBLE)
typedef double MagickRealType;
+#define fabs fabs
#elif (MAGICKCORE_SIZEOF_FLOAT_T == MAGICKCORE_SIZEOF_LONG_DOUBLE)
typedef long double MagickRealType;
+#define fabs fabsl
#else
# error Your float_t type is neither a float, nor a double, nor a long double
#endif
@@ -103,10 +111,13 @@ typedef unsigned short Quantum;
*/
#if MAGICKCORE_SIZEOF_DOUBLE_T == 0
typedef double MagickRealType;
+#define fabs fabs
#elif (MAGICKCORE_SIZEOF_DOUBLE_T == MAGICKCORE_SIZEOF_DOUBLE)
typedef double MagickRealType;
+#define fabs fabs
#elif (MAGICKCORE_SIZEOF_DOUBLE_T == MAGICKCORE_SIZEOF_LONG_DOUBLE)
typedef long double MagickRealType;
+#define fabs fabsl
#else
# error Your double_t type is neither a float, nor a double, nor a long double
#endif
@@ -131,6 +142,7 @@ typedef long double SignedQuantum;
typedef long double Quantum;
#define QuantumRange 18446744073709551615.0
#define QuantumFormat "%g"
+#define fabs fabsl
#else
#if !defined(_CH_)
# error "MAGICKCORE_QUANTUM_DEPTH must be one of 8, 16, 32, or 64"