diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-01-01 21:16:58 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-01-01 21:16:58 +0000 |
| commit | fe7d542352738e14c6d03bcc55b1e89b4e7c5c96 (patch) | |
| tree | 4a65542c39f0c8a9fb2ede8768acd8333a772a81 | |
| parent | 4ef4ffe1c563c1f1c91d49667cc31f3603f756d1 (diff) | |
| download | micropython-fe7d542352738e14c6d03bcc55b1e89b4e7c5c96.tar.gz micropython-fe7d542352738e14c6d03bcc55b1e89b4e7c5c96.zip | |
esp8266: Prefix includes with py/; remove need for -I../py.
| -rw-r--r-- | esp8266/Makefile | 1 | ||||
| -rw-r--r-- | esp8266/gccollect.c | 7 | ||||
| -rw-r--r-- | esp8266/main.c | 18 | ||||
| -rw-r--r-- | esp8266/modpyb.c | 10 | ||||
| -rw-r--r-- | esp8266/pybstdio.c | 9 |
5 files changed, 12 insertions, 33 deletions
diff --git a/esp8266/Makefile b/esp8266/Makefile index 5288e97d26..9ca514e438 100644 --- a/esp8266/Makefile +++ b/esp8266/Makefile @@ -12,7 +12,6 @@ ESP_SDK = $(shell $(CC) -print-sysroot)/usr INC = -I. INC += -I.. -INC += -I$(PY_SRC) INC += -I../stmhal INC += -I$(BUILD) INC += -I$(ESP_SDK)/include diff --git a/esp8266/gccollect.c b/esp8266/gccollect.c index 460ccb6889..46f9bb94ce 100644 --- a/esp8266/gccollect.c +++ b/esp8266/gccollect.c @@ -25,13 +25,8 @@ */ #include <stdio.h> -#include <stdint.h> -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "gc.h" +#include "py/gc.h" #include "gccollect.h" STATIC uint32_t stack_end; diff --git a/esp8266/main.c b/esp8266/main.c index 2f05ed0226..4bb183df2f 100644 --- a/esp8266/main.c +++ b/esp8266/main.c @@ -27,18 +27,12 @@ #include <stdio.h> #include <string.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "lexer.h" -#include "parse.h" -#include "obj.h" -#include "parsehelper.h" -#include "compile.h" -#include "runtime0.h" -#include "runtime.h" -#include "gc.h" +#include "py/nlr.h" +#include "py/parsehelper.h" +#include "py/compile.h" +#include "py/runtime0.h" +#include "py/runtime.h" +#include "py/gc.h" #include "pyexec.h" #include "gccollect.h" #include MICROPY_HAL_H diff --git a/esp8266/modpyb.c b/esp8266/modpyb.c index d40745b8fc..eeee67a88c 100644 --- a/esp8266/modpyb.c +++ b/esp8266/modpyb.c @@ -24,15 +24,11 @@ * THE SOFTWARE. */ -#include <stdint.h> #include <stdio.h> -#include "mpconfig.h" -#include "misc.h" -#include "nlr.h" -#include "qstr.h" -#include "obj.h" -#include "gc.h" +#include "py/nlr.h" +#include "py/obj.h" +#include "py/gc.h" #include "gccollect.h" #include "pyexec.h" #include "pybstdio.h" diff --git a/esp8266/pybstdio.c b/esp8266/pybstdio.c index 1b611486c6..d8f5f9b8f2 100644 --- a/esp8266/pybstdio.c +++ b/esp8266/pybstdio.c @@ -25,16 +25,11 @@ */ #include <stdio.h> -#include <stdint.h> #include <string.h> #include <errno.h> -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "misc.h" -#include "obj.h" -#include "stream.h" +#include "py/obj.h" +#include "py/stream.h" #include "pybstdio.h" #include MICROPY_HAL_H |