commit e5039c6ff887dfbee84e7853defda2b18722e24c
author Damien George <damien.p.george@gmail.com> Sun Feb 15 13:17:11 2015 +0000
committer Damien George <damien.p.george@gmail.com> Sun Feb 15 13:17:11 2015 +0000
tree e721f146212c7bfc122722504b030fbd8730adb6
parent f80f1a70777dd84171af02200b77033a08fba28a

py: Use TextIOWrapper only if PY_IO_FILEIO def'd; cast size_t for print.

py/modio.c

diff --git a/py/modio.c b/py/modio.c
index 30f766b..96572f5 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -38,10 +38,10 @@
     { 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 },

py/modmicropython.c

diff --git a/py/modmicropython.c b/py/modmicropython.c
index edd1375..1ed0936 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -57,7 +57,7 @@
     (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));