Merge branch 'master' of github.com:micropython/micropython

stmhal/pybwlan.c

@@ -5,9 +5,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/pyexec.c

@@ -3,9 +3,9 @@
 
 #include <stm32f4xx_hal.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "misc.h"
 #include "lexer.h"

stmhal/servo.c

@@ -2,9 +2,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/spi.c

@@ -3,9 +3,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/uart.c

@@ -3,9 +3,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

unix/file.c

@@ -5,9 +5,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

unix/main.c

@@ -8,9 +8,9 @@
 #include <sys/types.h>
 #include <errno.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "lexerunix.h"

unix/modffi.c

@@ -4,9 +4,9 @@
 #include <dlfcn.h>
 #include <ffi.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

unix/modsocket.c

@@ -11,9 +11,9 @@
 #include <netdb.h>
 #include <errno.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "objtuple.h"