djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix/mpconfigport: Move log2() definition to modmath.c. 

It's safer to define it where it's used, defining it for all source files
may lead to hard to diagnose conflicts in corner cases.
This commit is contained in:
Paul Sokolovsky 2015-11-13 13:24:39 +02:00
parent 432e8275a9
commit 6d1eabfeaa
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
py/modmath.c
View File

@ -52,6 +52,11 @@
STATIC mp_obj_t mp_math_ ## py_name(mp_obj_t x_obj) { mp_int_t x = MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj)); return mp_obj_new_int(x); } \
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_## py_name ## _obj, mp_math_ ## py_name);
#if MP_NEED_LOG2
// 1.442695040888963407354163704 is 1/_M_LN2
#define log2(x) (log(x) * 1.442695040888963407354163704)
#endif
/// \function sqrt(x)
/// Returns the square root of `x`.
MATH_FUN_1(sqrt, sqrt)

3
unix/mpconfigport.h
View File

@ -204,8 +204,7 @@ void mp_unix_mark_exec(void);
#include <android/api-level.h>
#if __ANDROID_API__ < 4
// Bionic libc in Android 1.5 misses these 2 functions
// 1.442695040888963407354163704 is 1/_M_LN2
#define log2(x) (log(x) * 1.442695040888963407354163704)
#define MP_NEED_LOG2 (1)
#define nan(x) NAN
#endif
#endif