From 0d27f4d9a66dcb47b545e715d1833094b0c7b484 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 12 Jul 2018 14:13:51 -0400 Subject: continued WIP: almost compiling --- extmod/modwebrepl.c | 2 +- extmod/uos_dupterm.c | 2 +- extmod/vfs_posix.c | 2 +- extmod/vfs_posix.h | 1 + extmod/vfs_posix_file.c | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) (limited to 'extmod') diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c index 48b49bfc4..06da210d1 100644 --- a/extmod/modwebrepl.c +++ b/extmod/modwebrepl.c @@ -37,7 +37,7 @@ #include "extmod/modwebsocket.h" #include "genhdr/mpversion.h" -#ifdef MICROPY_PY_WEBREPL +#if MICROPY_PY_WEBREPL #if 0 // print debugging info #define DEBUG_printf DEBUG_printf diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c index 0de26cbdd..cc6d97f41 100644 --- a/extmod/uos_dupterm.c +++ b/extmod/uos_dupterm.c @@ -34,7 +34,7 @@ #include "py/stream.h" #include "lib/utils/interrupt_char.h" -#ifdef MICROPY_PY_OS_DUPTERM +#if MICROPY_PY_OS_DUPTERM void mp_uos_deactivate(size_t dupterm_idx, const char *msg, mp_obj_t exc) { mp_obj_t term = MP_STATE_VM(dupterm_objs[dupterm_idx]); diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c index 6e3bb2c5b..9ee4900ee 100644 --- a/extmod/vfs_posix.c +++ b/extmod/vfs_posix.c @@ -29,7 +29,7 @@ #include "extmod/vfs.h" #include "extmod/vfs_posix.h" -#if MICROPY_VFS_POSIX +#if defined(MICROPY_VFS_POSIX) && MICROPY_VFS_POSIX #include #include diff --git a/extmod/vfs_posix.h b/extmod/vfs_posix.h index 00756b4c9..32299b826 100644 --- a/extmod/vfs_posix.h +++ b/extmod/vfs_posix.h @@ -27,6 +27,7 @@ #define MICROPY_INCLUDED_EXTMOD_VFS_POSIX_H #include "py/lexer.h" +#include "py/mpconfig.h" #include "py/obj.h" extern const mp_obj_type_t mp_type_vfs_posix; diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c index 435ac65cd..d3ed4fe21 100644 --- a/extmod/vfs_posix_file.c +++ b/extmod/vfs_posix_file.c @@ -28,7 +28,7 @@ #include "py/stream.h" #include "extmod/vfs_posix.h" -#if MICROPY_VFS_POSIX +#if defined(MICROPY_VFS_POSIX) && MICROPY_VFS_POSIX #include -- cgit v1.2.3