diff options
| author | Daniel Tralamazza <daniel@tralamazza.com> | 2017-08-08 00:45:58 +0200 |
|---|---|---|
| committer | Daniel Tralamazza <daniel@tralamazza.com> | 2017-08-08 00:45:58 +0200 |
| commit | b53b6913147bdee5aef1b54f7728d44580dd0935 (patch) | |
| tree | cfbfad1ddf3ef386131ec5a39961be70d4b60398 /py/modmicropython.c | |
| parent | 3e0d3d283d5619e52e04dc8484d7bf413e66d130 (diff) | |
| parent | 6c55cdafa32e4db9e2aaf08b1ec597b4723721ea (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'py/modmicropython.c')
| -rw-r--r-- | py/modmicropython.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/py/modmicropython.c b/py/modmicropython.c index d76706230..6fa3f9ad2 100644 --- a/py/modmicropython.c +++ b/py/modmicropython.c @@ -1,5 +1,5 @@ /* - * This file is part of the Micro Python project, http://micropython.org/ + * This file is part of the MicroPython project, http://micropython.org/ * * The MIT License (MIT) * @@ -72,7 +72,8 @@ mp_obj_t mp_micropython_mem_info(size_t n_args, const mp_obj_t *args) { (mp_uint_t)m_get_total_bytes_allocated(), (mp_uint_t)m_get_current_bytes_allocated(), (mp_uint_t)m_get_peak_bytes_allocated()); #endif #if MICROPY_STACK_CHECK - mp_printf(&mp_plat_print, "stack: " UINT_FMT " out of " INT_FMT "\n", mp_stack_usage(), MP_STATE_THREAD(stack_limit)); + mp_printf(&mp_plat_print, "stack: " UINT_FMT " out of " UINT_FMT "\n", + mp_stack_usage(), (mp_uint_t)MP_STATE_THREAD(stack_limit)); #else mp_printf(&mp_plat_print, "stack: " UINT_FMT "\n", mp_stack_usage()); #endif |