Merge branch 'stinos-mingw-float-printf'

This commit is contained in:
Damien George 2014-05-03 22:44:24 +01:00
commit 75aebda809
5 changed files with 14 additions and 0 deletions

View File

@ -42,6 +42,11 @@ const mp_obj_module_t mp_module___main__ = {
}; };
void mp_init(void) { void mp_init(void) {
// call port specific initialization if any
#ifdef MICROPY_PORT_INIT_FUNC
MICROPY_PORT_INIT_FUNC;
#endif
mp_emit_glue_init(); mp_emit_glue_init();
// init global module stuff // init global module stuff

View File

@ -31,6 +31,7 @@ SRC_C = \
unix/main.c \ unix/main.c \
unix/file.c \ unix/file.c \
realpath.c \ realpath.c \
init.c \
OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))

5
windows/init.c Normal file
View File

@ -0,0 +1,5 @@
#include <stdlib.h>
void init() {
putenv("PRINTF_EXPONENT_DIGITS=2");
}

1
windows/init.h Normal file
View File

@ -0,0 +1 @@
void init(void);

View File

@ -15,6 +15,7 @@
#define MICROPY_MOD_SYS_STDFILES (1) #define MICROPY_MOD_SYS_STDFILES (1)
#define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_DOUBLE) #define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_DOUBLE)
#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ) #define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ)
#define MICROPY_PORT_INIT_FUNC init()
// type definitions for the specific machine // type definitions for the specific machine
@ -38,3 +39,4 @@ extern const struct _mp_obj_fun_native_t mp_builtin_open_obj;
{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
#include "realpath.h" #include "realpath.h"
#include "init.h"