put fmodl in Port

dlang · May 18, 2011 · fc7e107 · fc7e107
1 parent d6a98ae
commit fc7e107
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/src/constfold.c b/src/constfold.c
@@ -36,10 +36,6 @@ extern "C" bool real_isnan (const real_t *);
 
 static real_t zero;     // work around DMC bug for now
 
-#if __FreeBSD__ || __OpenBSD__
-#define fmodl fmod      // hack for now, fix later
-#endif
-
 #define LOG 0
 
 Expression *expType(Type *type, Expression *e)
@@ -495,22 +491,22 @@ Expression *Mod(Type *type, Expression *e1, Expression *e2)
         {   real_t r2 = e2->toReal();
 
 #ifdef __DMC__
-            c = fmodl(e1->toReal(), r2) + fmodl(e1->toImaginary(), r2) * I;
+            c = Port::fmodl(e1->toReal(), r2) + Port::fmodl(e1->toImaginary(), r2) * I;
 #elif defined(IN_GCC)
             c = complex_t(e1->toReal() % r2, e1->toImaginary() % r2);
 #else
-            c = complex_t(fmodl(e1->toReal(), r2), fmodl(e1->toImaginary(), r2));
+            c = complex_t(Port::fmodl(e1->toReal(), r2), Port::fmodl(e1->toImaginary(), r2));
 #endif
         }
         else if (e2->type->isimaginary())
         {   real_t i2 = e2->toImaginary();
 
 #ifdef __DMC__
-            c = fmodl(e1->toReal(), i2) + fmodl(e1->toImaginary(), i2) * I;
+            c = Port::fmodl(e1->toReal(), i2) + Port::fmodl(e1->toImaginary(), i2) * I;
 #elif defined(IN_GCC)
             c = complex_t(e1->toReal() % i2, e1->toImaginary() % i2);
 #else
-            c = complex_t(fmodl(e1->toReal(), i2), fmodl(e1->toImaginary(), i2));
+            c = complex_t(Port::fmodl(e1->toReal(), i2), Port::fmodl(e1->toImaginary(), i2));
 #endif
         }
         else

diff --git a/src/root/port.c b/src/root/port.c
@@ -70,6 +70,11 @@ double Port::pow(double x, double y)
     return ::pow(x, y);
 }
 
+long double Port::fmodl(long double x, long double y)
+{
+    return ::fmodl(x, y);
+}
+
 unsigned long long Port::strtoull(const char *p, char **pend, int base)
 {
     return ::strtoull(p, pend, base);
@@ -201,6 +206,11 @@ double Port::pow(double x, double y)
     return ::pow(x, y);
 }
 
+long double Port::fmodl(long double x, long double y)
+{
+    return ::fmodl(x, y);
+}
+
 unsigned _int64 Port::strtoull(const char *p, char **pend, int base)
 {
     unsigned _int64 number = 0;
@@ -442,6 +452,15 @@ double Port::pow(double x, double y)
     return ::pow(x, y);
 }
 
+long double Port::fmodl(long double x, long double y)
+{
+#if __FreeBSD__ || __OpenBSD__
+    return ::fmod(x, y);        // hack for now, fix later
+#else
+    return ::fmodl(x, y);
+#endif
+}
+
 unsigned long long Port::strtoull(const char *p, char **pend, int base)
 {
     return ::strtoull(p, pend, base);

diff --git a/src/root/port.h b/src/root/port.h
@@ -61,6 +61,8 @@ struct Port
     static double floor(double);
     static double pow(double x, double y);
 
+    static long double fmodl(long double x, long double y);
+
     static ulonglong strtoull(const char *p, char **pend, int base);
 
     static char *ull_to_string(char *buffer, ulonglong ull);