Use universal include file ieee754names.h.

git-svn-id: http://squeakvm.org/svn/squeak/trunk/platforms/Cross/plugins@1528 fa1542d4-bde8-0310-ad64-8ed1123d492a

Author: andreas

FloatMathPlugin/FloatMathPlugin.h

@@ -1,6 +1,6 @@
 /* we only declare those functions from fdlibm that we actually use
    and avoid including fdlibm.h alltogether as it conflicts with math.h */
-
+#define NO_ISNAN
 #ifndef NO_ISNAN
 /* by default we use fdlibm's isnan() */
 extern int isnan(double);

FloatMathPlugin/acos.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_acos.c"

FloatMathPlugin/acosh.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_acosh.c"

FloatMathPlugin/asin.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_asin.c"

FloatMathPlugin/asinh.c

@@ -1,2 +1,2 @@
-#define asinh __ieee754_asinh
+#include "ieee754names.h"
 #include "fdlibm/s_asinh.c"

FloatMathPlugin/atan.c

@@ -1,2 +1,2 @@
-#define atan __ieee754_atan
+#include "ieee754names.h"
 #include "fdlibm/s_atan.c"

FloatMathPlugin/atan2.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_atan2.c"

FloatMathPlugin/atanh.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_atanh.c"

FloatMathPlugin/copysign.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/s_copysign.c"

FloatMathPlugin/cos.c

@@ -1,2 +1,2 @@
-#define cos __ieee754_cos
+#include "ieee754names.h"
 #include "fdlibm/s_cos.c"

FloatMathPlugin/cosh.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_cosh.c"

FloatMathPlugin/exp.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_exp.c"

FloatMathPlugin/expm1.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/s_expm1.c"

FloatMathPlugin/finite.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/s_finite.c"

FloatMathPlugin/fmod.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_fmod.c"

FloatMathPlugin/hypot.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_hypot.c"

FloatMathPlugin/ieee754names.h

@@ -0,0 +1,14 @@
+/* Re-define all of the conflicting names of fdlibm to use __ieee754_ prefix */
+#define asinh __ieee754_asinh
+#define atan __ieee754_atan
+#define cos __ieee754_cos
+#define expm1 __ieee754_expm1
+#define finite __ieee754_finite
+#define ldexp __ieee754_ldexp
+#define scalbn __ieee754_scalbn
+#define log1p __ieee754_log1p
+#define modf __ieee754_modf
+#define rint __ieee754_rint
+#define sin __ieee754_sin
+#define tan __ieee754_tan
+#define tanh __ieee754_tanh

FloatMathPlugin/isnan.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/s_isnan.c"

FloatMathPlugin/k_cos.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/k_cos.c"

FloatMathPlugin/k_rem_pio2.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/k_rem_pio2.c"

FloatMathPlugin/k_sin.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/k_sin.c"

FloatMathPlugin/k_tan.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/k_tan.c"

FloatMathPlugin/ldexp.c

@@ -1,2 +1,2 @@
-#define ldexp __ieee754_ldexp
+#include "ieee754names.h"
 #include "fdlibm/s_ldexp.c"

FloatMathPlugin/log.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_log.c"

FloatMathPlugin/log10.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_log10.c"

FloatMathPlugin/log1p.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/s_log1p.c"

FloatMathPlugin/modf.c

@@ -1,2 +1,2 @@
-#define modf __ieee754_modf
+#include "ieee754names.h"
 #include "fdlibm/s_modf.c"

FloatMathPlugin/pow.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_pow.c"

FloatMathPlugin/rem_pio2.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_rem_pio2.c"

FloatMathPlugin/rint.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/s_rint.c"

FloatMathPlugin/scalb.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_scalb.c"

FloatMathPlugin/scalbn.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/s_scalbn.c"

FloatMathPlugin/sin.c

@@ -1,2 +1,2 @@
-#define sin __ieee754_sin
+#include "ieee754names.h"
 #include "fdlibm/s_sin.c"

FloatMathPlugin/sinh.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_sinh.c"

FloatMathPlugin/sqrt.c

@@ -1 +1,2 @@
+#include "ieee754names.h"
 #include "fdlibm/e_sqrt.c"

FloatMathPlugin/tan.c

@@ -1,2 +1,2 @@
-#define tan __ieee754_tan
+#include "ieee754names.h"
 #include "fdlibm/s_tan.c"

FloatMathPlugin/tanh.c

@@ -1,2 +1,2 @@
-#define tanh __ieee754_tanh
+#include "ieee754names.h"
 #include "fdlibm/s_tanh.c"