Skip to content

Commit 6d7e470

Browse files
dpgeorgedpgeorge
committed
unix: Prefix includes with py/; remove need for -I../py.
1 parent 3765ea4 commit 6d7e470

10 files changed

Lines changed: 31 additions & 66 deletions

File tree

‎unix/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ include ../py/py.mk
1515

1616
INC = -I.
1717
INC += -I..
18-
INC += -I$(PY_SRC)
1918
INC += -I$(BUILD)
2019

2120
# compiler settings

‎unix/file.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,9 @@
3131
#include <sys/stat.h>
3232
#include <sys/types.h>
3333

34-
#include "mpconfig.h"
35-
#include "nlr.h"
36-
#include "misc.h"
37-
#include "qstr.h"
38-
#include "obj.h"
39-
#include "runtime.h"
40-
#include "stream.h"
34+
#include "py/nlr.h"
35+
#include "py/runtime.h"
36+
#include "py/stream.h"
4137

4238
#ifdef _WIN32
4339
#define fsync _commit

‎unix/gccollect.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,8 @@
2525
*/
2626

2727
#include <stdio.h>
28-
#include <stdint.h>
2928

30-
#include "mpconfig.h"
31-
#include "misc.h"
32-
#include "gc.h"
29+
#include "py/gc.h"
3330

3431
#if MICROPY_ENABLE_GC
3532

‎unix/input.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,11 @@
2525
*/
2626

2727
#include <stdio.h>
28-
#include <stdint.h>
2928
#include <stdlib.h>
3029
#include <string.h>
3130

32-
#include "mpconfig.h"
33-
#include "nlr.h"
34-
#include "misc.h"
35-
#include "qstr.h"
36-
#include "obj.h"
31+
#include "py/nlr.h"
32+
#include "py/obj.h"
3733
#include "input.h"
3834

3935
#if MICROPY_USE_READLINE

‎unix/main.c‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,17 @@
3535
#include <sys/types.h>
3636
#include <errno.h>
3737

38-
#include "mpconfig.h"
39-
#include "nlr.h"
40-
#include "obj.h"
41-
#include "parsehelper.h"
42-
#include "compile.h"
43-
#include "runtime0.h"
44-
#include "runtime.h"
45-
#include "builtin.h"
46-
#include "repl.h"
47-
#include "gc.h"
38+
#include "py/nlr.h"
39+
#include "py/compile.h"
40+
#include "py/parsehelper.h"
41+
#include "py/runtime.h"
42+
#include "py/builtin.h"
43+
#include "py/repl.h"
44+
#include "py/gc.h"
45+
#include "py/stackctrl.h"
46+
#include "py/pfenv.h"
4847
#include "genhdr/py-version.h"
4948
#include "input.h"
50-
#include "stackctrl.h"
51-
#include "pfenv.h"
5249

5350
// Command line options, with their defaults
5451
STATIC bool compile_only = false;

‎unix/modffi.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,9 @@
3131
#include <dlfcn.h>
3232
#include <ffi.h>
3333

34-
#include "mpconfig.h"
35-
#include "nlr.h"
36-
#include "misc.h"
37-
#include "qstr.h"
38-
#include "obj.h"
39-
#include "runtime.h"
40-
#include "binary.h"
34+
#include "py/nlr.h"
35+
#include "py/runtime.h"
36+
#include "py/binary.h"
4137

4238
/*
4339
* modffi uses character codes to encode a value type, based on "struct"

‎unix/modos.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,9 @@
3131
#include <errno.h>
3232
#include <stdlib.h>
3333

34-
#include "mpconfig.h"
35-
#include "misc.h"
36-
#include "nlr.h"
37-
#include "qstr.h"
38-
#include "obj.h"
39-
#include "runtime.h"
40-
#include "objtuple.h"
34+
#include "py/nlr.h"
35+
#include "py/runtime.h"
36+
#include "py/objtuple.h"
4137

4238
#define RAISE_ERRNO(err_flag, error_val) \
4339
{ if (err_flag == -1) \

‎unix/modsocket.c‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,12 @@
3838
#include <netdb.h>
3939
#include <errno.h>
4040

41-
#include "mpconfig.h"
42-
#include "nlr.h"
43-
#include "misc.h"
44-
#include "qstr.h"
45-
#include "obj.h"
46-
#include "objtuple.h"
47-
#include "objstr.h"
48-
#include "runtime.h"
49-
#include "stream.h"
50-
#include "builtin.h"
41+
#include "py/nlr.h"
42+
#include "py/objtuple.h"
43+
#include "py/objstr.h"
44+
#include "py/runtime.h"
45+
#include "py/stream.h"
46+
#include "py/builtin.h"
5147

5248
/*
5349
The idea of this module is to implement reasonable minimum of

‎unix/modtermios.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,9 @@
2929
#include <unistd.h>
3030
#include <errno.h>
3131

32-
#include "mpconfig.h"
33-
#include "misc.h"
34-
#include "nlr.h"
35-
#include "qstr.h"
36-
#include "obj.h"
37-
#include "runtime.h"
38-
#include "objlist.h"
32+
#include "py/nlr.h"
33+
#include "py/objlist.h"
34+
#include "py/runtime.h"
3935

4036
#define RAISE_ERRNO(err_flag, error_val) \
4137
{ if (err_flag == -1) \

‎unix/modtime.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@
3030
#include <sys/time.h>
3131
#include <math.h>
3232

33-
#include "mpconfig.h"
34-
#include "misc.h"
35-
#include "qstr.h"
36-
#include "obj.h"
37-
#include "runtime.h"
33+
#include "py/runtime.h"
3834

3935
#ifdef _WIN32
4036
void msec_sleep_tv(struct timeval *tv) {

0 commit comments

Comments
 (0)