diff options
| author | Scott Shawcroft <scott@chickadee.tech> | 2016-09-02 19:39:50 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott@chickadee.tech> | 2016-09-02 19:39:50 -0700 |
| commit | c6c977070eb82e453d685e86d7f481871eaf292a (patch) | |
| tree | 1a1ecc8553785f2b183a8e607311a31a7e4cd445 /lib/utils | |
| parent | 09be96a6aa56734f13a7a7b7c5c1c5f29f014364 (diff) | |
| parent | f7c461152364650b71231387c3f80b37277c9161 (diff) | |
Merge remote-tracking branch 'micropython/master'
Diffstat (limited to 'lib/utils')
| -rw-r--r-- | lib/utils/pyexec.c | 2 | ||||
| -rw-r--r-- | lib/utils/stdout_helpers.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/utils/pyexec.c b/lib/utils/pyexec.c index 411ee969d..2bc7a00cc 100644 --- a/lib/utils/pyexec.c +++ b/lib/utils/pyexec.c @@ -112,7 +112,7 @@ STATIC int parse_compile_execute(void *source, mp_parse_input_kind_t input_kind, printf("took " UINT_FMT " ms\n", ticks); // qstr info { - mp_uint_t n_pool, n_qstr, n_str_data_bytes, n_total_bytes; + size_t n_pool, n_qstr, n_str_data_bytes, n_total_bytes; qstr_pool_info(&n_pool, &n_qstr, &n_str_data_bytes, &n_total_bytes); printf("qstr:\n n_pool=" UINT_FMT "\n n_qstr=" UINT_FMT "\n n_str_data_bytes=" UINT_FMT "\n n_total_bytes=" UINT_FMT "\n", n_pool, n_qstr, n_str_data_bytes, n_total_bytes); } diff --git a/lib/utils/stdout_helpers.c b/lib/utils/stdout_helpers.c index 6efe10b92..5f7a17d32 100644 --- a/lib/utils/stdout_helpers.c +++ b/lib/utils/stdout_helpers.c @@ -11,7 +11,7 @@ // Send "cooked" string of given length, where every occurance of // LF character is replaced with CR LF. -void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) { +void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) { while (len--) { if (*str == '\n') { mp_hal_stdout_tx_strn("\r", 1); |