From e5039c6ff887dfbee84e7853defda2b18722e24c Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sun, 15 Feb 2015 13:17:11 +0000
Subject: [PATCH] py: Use TextIOWrapper only if PY_IO_FILEIO def'd; cast size_t
for print.
---
py/modio.c | 2 +-
py/modmicropython.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/py/modio.c b/py/modio.c
index 30f766b40..96572f5ae 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -38,10 +38,10 @@ STATIC const mp_map_elem_t mp_module_io_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
#if MICROPY_PY_IO_FILEIO
{ MP_OBJ_NEW_QSTR(MP_QSTR_FileIO), (mp_obj_t)&mp_type_fileio },
- #endif
#if MICROPY_CPYTHON_COMPAT
{ MP_OBJ_NEW_QSTR(MP_QSTR_TextIOWrapper), (mp_obj_t)&mp_type_textio },
#endif
+ #endif
{ MP_OBJ_NEW_QSTR(MP_QSTR_StringIO), (mp_obj_t)&mp_type_stringio },
#if MICROPY_PY_IO_BYTESIO
{ MP_OBJ_NEW_QSTR(MP_QSTR_BytesIO), (mp_obj_t)&mp_type_bytesio },
diff --git a/py/modmicropython.c b/py/modmicropython.c
index edd137579..1ed0936ce 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -57,7 +57,7 @@ mp_obj_t mp_micropython_mem_info(mp_uint_t n_args, const mp_obj_t *args) {
(void)args;
#if MICROPY_MEM_STATS
printf("mem: total=" UINT_FMT ", current=" UINT_FMT ", peak=" UINT_FMT "\n",
- m_get_total_bytes_allocated(), m_get_current_bytes_allocated(), m_get_peak_bytes_allocated());
+ (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
printf("stack: " UINT_FMT " out of " INT_FMT "\n", mp_stack_usage(), MP_STATE_VM(stack_limit));
--
GitLab