Update Lua Bindings, fix inconsistencies.

[ardour.git] / libs / pbd / msvc / msvc_pbd.cc

diff --git a/libs/pbd/msvc/msvc_pbd.cc b/libs/pbd/msvc/msvc_pbd.cc
index 5b9c9d449af94bfc57eec0d2f0fcc7fe6a595a39..20065fff260215bce241f56f691311303a7720a0 100644 (file)
--- a/libs/pbd/msvc/msvc_pbd.cc
+++ b/libs/pbd/msvc/msvc_pbd.cc
@@ -223,6 +223,63 @@ ssize_t ret;
        return (ret);
 }
 
+#if defined(_MSC_VER) && (_MSC_VER < 1800)
+//***************************************************************
+//
+//     expm1()
+//
+// Emulates C99 expm1() using exp().
+//
+//     Returns:
+//
+//    On Success: (('e' raised to the power of 'x') - 1)
+//                (e.g. expm1(1) == 1.7182818).
+//    On Failure: None, except that calling exp(x) should generate
+//                an appropriate error for us (such as INF etc).
+//
+LIBPBD_API double PBD_APICALLTYPE
+expm1(double x)
+{
+       return (exp(x) - (double)1.0);
+}
+
+//***************************************************************
+//
+//     log1p()
+//
+// Emulates C99 log1p() using log().
+//
+//     Returns:
+//
+//    On Success: The natural logarithm of (1 + x)
+//                (e.g. log1p(1) == 0.69314718).
+//    On Failure: None, except that calling log(x) should generate
+//                an appropriate error for us (such as ERANGE etc).
+//
+LIBPBD_API double PBD_APICALLTYPE
+log1p(double x)
+{
+       return (log(x + (double)1.0));
+}
+
+//***************************************************************
+//
+//     roundf()
+//
+// Emulates roundf() using floorf().
+//
+//     Returns:
+//
+//    On Success: The largest integer that is less than or
+//                equal to 'x'.
+//    On Failure: None
+//
+LIBPBD_API float PBD_APICALLTYPE
+roundf(float x)
+{
+       return (floorf(x));
+}
+
 //***************************************************************
 //
 //     round()
@@ -240,6 +297,49 @@ round(double x)
 {
        return (floor(x));
 }
+#endif
+
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
+//***************************************************************
+//
+//     log2()
+//
+// Emulates C99 log2() using log().
+//
+//     Returns:
+//
+//    On Success: The binary (base-2) logarithm of 'x'
+//                (e.g. log2(1024) == 10).
+//    On Failure: None, except that calling log(x) should generate
+//                an appropriate error for us (such as ERANGE etc).
+//
+LIBPBD_API double PBD_APICALLTYPE
+log2(double x)
+{
+       return (log(x) / log((double)2.0));
+}
+
+//***************************************************************
+//
+//     trunc()
+//
+// Emulates trunc() using floor() and ceil().
+//
+//     Returns:
+//
+//    On Success: The largest integer whose magnitude is less
+//                than or equal to 'x' (regardless of sign).
+//    On Failure: None
+//
+LIBPBD_API double PBD_APICALLTYPE
+trunc(double x)
+{
+       if (x < 0)
+               return (ceil(x));
+
+       return (floor(x));
+}
+#endif
 
 namespace PBD {