diff options
| author | Tom Collins <tom.collins@digi.com> | 2017-01-12 16:08:51 -0800 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2017-05-14 18:24:50 +0300 |
| commit | f06d0839bdaff783d8902bcedb572cbaabb6447a (patch) | |
| tree | 7087cd53e9b36b3f52b35f497eef5e110d7e7e9b /py/modsys.c | |
| parent | 55491031be1f267e07b2495916d4f5ba2735cc00 (diff) | |
| download | micropython-f06d0839bdaff783d8902bcedb572cbaabb6447a.tar.gz micropython-f06d0839bdaff783d8902bcedb572cbaabb6447a.zip | |
py/modsys: update conditionals for code referencing sys.stdout
Working on a build with PY_IO enabled (for PY_UJSON support) but PY_SYS_STDFILES disabled (no filesystem). There are multiple references to mp_sys_stdout_obj that should only be enabled if both PY_IO and PY_SYS_STDFILES are enabled.
Diffstat (limited to 'py/modsys.c')
| -rw-r--r-- | py/modsys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/py/modsys.c b/py/modsys.c index b208c88bd6..5fbcb944c4 100644 --- a/py/modsys.c +++ b/py/modsys.c @@ -45,7 +45,7 @@ extern struct _mp_dummy_t mp_sys_stdin_obj; extern struct _mp_dummy_t mp_sys_stdout_obj; extern struct _mp_dummy_t mp_sys_stderr_obj; -#if MICROPY_PY_IO +#if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES const mp_print_t mp_sys_stdout_print = {&mp_sys_stdout_obj, mp_stream_write_adaptor}; #endif @@ -106,7 +106,7 @@ STATIC mp_obj_t mp_sys_exit(size_t n_args, const mp_obj_t *args) { MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_sys_exit_obj, 0, 1, mp_sys_exit); STATIC mp_obj_t mp_sys_print_exception(size_t n_args, const mp_obj_t *args) { - #if MICROPY_PY_IO + #if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES void *stream_obj = &mp_sys_stdout_obj; if (n_args > 1) { stream_obj = MP_OBJ_TO_PTR(args[1]); // XXX may fail |