extmod: Prefix py/ for includes from py core directory.

10 years ago · 3765ea419a
7 changed files with 23 additions and 50 deletions
--- a/extmod/modubinascii.c
+++ b/extmod/modubinascii.c
@ -28,13 +28,9 @@
 #include <assert.h>
 #include <string.h>

-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "binary.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/binary.h"

 #if MICROPY_PY_UBINASCII

--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@ -27,14 +27,11 @@
 #include <assert.h>
 #include <string.h>
 #include <stdint.h>
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "objtuple.h"
-#include "binary.h"
+
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/objtuple.h"
+#include "py/binary.h"

 #if MICROPY_PY_UCTYPES

--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@ -27,12 +27,8 @@
 #include <assert.h>
 #include <string.h>

-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"

 #if MICROPY_PY_UHASHLIB

--- a/extmod/moduheapq.c
+++ b/extmod/moduheapq.c
@ -26,14 +26,10 @@

 #include <unistd.h>

-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objlist.h"
-#include "runtime0.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/objlist.h"
+#include "py/runtime0.h"
+#include "py/runtime.h"

 #if MICROPY_PY_UHEAPQ

--- a/extmod/modujson.c
+++ b/extmod/modujson.c
@ -28,14 +28,10 @@
 #include <unistd.h>
 #include <string.h>

-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objlist.h"
-#include "parsenum.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/objlist.h"
+#include "py/parsenum.h"
+#include "py/runtime.h"

 #if MICROPY_PY_UJSON

--- a/extmod/modure.c
+++ b/extmod/modure.c
@ -28,13 +28,9 @@
 #include <assert.h>
 #include <string.h>

-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "binary.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/binary.h"

 #if MICROPY_PY_URE

--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@ -31,12 +31,8 @@
 #include <sys/time.h>
 #include <math.h>

-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "nlr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"

 #if MICROPY_PY_UZLIB