summaryrefslogtreecommitdiff
path: root/esp8266
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2017-03-31 22:29:39 +1100
committerDamien George <damien.p.george@gmail.com>2017-03-31 22:29:39 +1100
commitb6c7e4b143d96ff9f84ccb22d83b1e15ab084250 (patch)
treecb1e587ea32fab2bcc2837cdfed498abcfdb9479 /esp8266
parent6e6c01b97189a95b59a037fa7dabcf8217f199af (diff)
all: Use full path name when including mp-readline/timeutils/netutils.
This follows the pattern of how all other headers are now included, and makes it explicit where the header file comes from. This patch also removes -I options from Makefile's that specify the mp-readline/timeutils/ netutils directories, which are no longer needed.
Diffstat (limited to 'esp8266')
-rw-r--r--esp8266/Makefile3
-rw-r--r--esp8266/fatfs_port.c2
-rw-r--r--esp8266/machine_rtc.c2
-rw-r--r--esp8266/modnetwork.c2
-rw-r--r--esp8266/modutime.c2
5 files changed, 4 insertions, 7 deletions
diff --git a/esp8266/Makefile b/esp8266/Makefile
index 28dbf08a6..a3da9d398 100644
--- a/esp8266/Makefile
+++ b/esp8266/Makefile
@@ -25,9 +25,6 @@ ESP_SDK = $(shell $(CC) -print-sysroot)/usr
INC += -I.
INC += -I..
INC += -I../stmhal
-INC += -I../lib/mp-readline
-INC += -I../lib/netutils
-INC += -I../lib/timeutils
INC += -I$(BUILD)
INC += -I$(ESP_SDK)/include
diff --git a/esp8266/fatfs_port.c b/esp8266/fatfs_port.c
index 20c3235d4..02384f605 100644
--- a/esp8266/fatfs_port.c
+++ b/esp8266/fatfs_port.c
@@ -25,8 +25,8 @@
*/
#include "py/obj.h"
+#include "lib/timeutils/timeutils.h"
#include "lib/oofatfs/ff.h"
-#include "timeutils.h"
#include "modmachine.h"
DWORD get_fattime(void) {
diff --git a/esp8266/machine_rtc.c b/esp8266/machine_rtc.c
index 8c1fe0779..019b705ba 100644
--- a/esp8266/machine_rtc.c
+++ b/esp8266/machine_rtc.c
@@ -30,7 +30,7 @@
#include "py/nlr.h"
#include "py/obj.h"
#include "py/runtime.h"
-#include "timeutils.h"
+#include "lib/timeutils/timeutils.h"
#include "user_interface.h"
#include "modmachine.h"
diff --git a/esp8266/modnetwork.c b/esp8266/modnetwork.c
index 762717b35..627655b36 100644
--- a/esp8266/modnetwork.c
+++ b/esp8266/modnetwork.c
@@ -32,7 +32,7 @@
#include "py/objlist.h"
#include "py/runtime.h"
#include "py/mphal.h"
-#include "netutils.h"
+#include "lib/netutils/netutils.h"
#include "queue.h"
#include "user_interface.h"
#include "espconn.h"
diff --git a/esp8266/modutime.c b/esp8266/modutime.c
index 117720e6f..bdeb3bb45 100644
--- a/esp8266/modutime.c
+++ b/esp8266/modutime.c
@@ -34,8 +34,8 @@
#include "py/runtime.h"
#include "py/mphal.h"
#include "py/smallint.h"
+#include "lib/timeutils/timeutils.h"
#include "modmachine.h"
-#include "timeutils.h"
#include "user_interface.h"
#include "extmod/utime_mphal.h"