From a896951a9a8d8585d094e5ee6d7d37ff17d1b73e Mon Sep 17 00:00:00 2001 From: Colin Hogben Date: Mon, 9 May 2016 22:11:34 +0100 Subject: [PATCH] py/objfloat, py/modmath: Ensure M_PI and M_E defined. In some compliation enviroments (e.g. mbed online compiler) with strict standards compliance, does not define constants such as M_PI. Provide fallback definitions of M_E and M_PI where needed. --- py/modmath.c | 5 +++++ py/objfloat.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/py/modmath.c b/py/modmath.c index 6abf8ab3e9..54262f6115 100644 --- a/py/modmath.c +++ b/py/modmath.c @@ -31,6 +31,11 @@ #include +// M_PI is not part of the math.h standard and may not be defined +#ifndef M_PI +#define M_PI (3.14159265358979323846) +#endif + /// \module math - mathematical functions /// /// The `math` module provides some basic mathematical funtions for diff --git a/py/objfloat.c b/py/objfloat.c index aa37f9ab2d..85b8b13861 100644 --- a/py/objfloat.c +++ b/py/objfloat.c @@ -41,6 +41,14 @@ #if MICROPY_OBJ_REPR != MICROPY_OBJ_REPR_C && MICROPY_OBJ_REPR != MICROPY_OBJ_REPR_D +// M_E and M_PI are not part of the math.h standard and may not be defined +#ifndef M_E +#define M_E (2.7182818284590452354) +#endif +#ifndef M_PI +#define M_PI (3.14159265358979323846) +#endif + typedef struct _mp_obj_float_t { mp_obj_base_t base; mp_float_t value;