diff --git a/source/AdaptiveContouring/adaptive_contour.c b/source/AdaptiveContouring/adaptive_contour.c index 5cfe8a8d..c1974a84 100644 --- a/source/AdaptiveContouring/adaptive_contour.c +++ b/source/AdaptiveContouring/adaptive_contour.c @@ -12,6 +12,7 @@ /* Revision RP 02-02-18 */ /* Revision RP 24-02-18 */ /* Revision RP 15-11-18 */ +/* Revision RP 25-01-24 ifndef M_LN2 */ #include @@ -36,6 +37,10 @@ typedef enum {FALSE,TRUE} boolean; #define BIGG 1e37 +#ifndef M_LN2 +#define M_LN2 0.693147180559945309417 +#endif + typedef struct region { int level; FLOAT x1,x2; diff --git a/source/AdaptiveContouring/binext_adap.c b/source/AdaptiveContouring/binext_adap.c index eb7a17bb..7dde93d4 100644 --- a/source/AdaptiveContouring/binext_adap.c +++ b/source/AdaptiveContouring/binext_adap.c @@ -8,6 +8,7 @@ /* RP 02-02-18 */ /* RP 16-03-18 */ /* RP 15-11-18 */ +/* RP 25-01-24 ifndef M_PI; sin/cos */ #define _GNU_SOURCE #include @@ -26,6 +27,10 @@ typedef enum {FALSE,TRUE} boolean; #define BIGG 1e37 +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + typedef struct ptlist { FLOAT x1,x2; int min_lvl; @@ -182,11 +187,9 @@ FLOAT magt_binext(FLOAT t, FLOAT t0, FLOAT tE, FLOAT alpha, FLOAT u0, p = (t-t0)/tE; -#ifdef __APPLE__ - __sincos(alpha,&sa,&ca); -#else - sincos(alpha,&sa,&ca); -#endif + sa = sin(alpha); + ca = cos(alpha); + y1 = p*ca-u0*sa; y2 = p*sa+u0*ca; diff --git a/source/MulensModel/version.py b/source/MulensModel/version.py index 2c109d88..3ea83e0a 100644 --- a/source/MulensModel/version.py +++ b/source/MulensModel/version.py @@ -1 +1 @@ -__version__ = "2.19.4" +__version__ = "2.20.0"