py: Include mpconfig.h before all other includes.

It defines types used by all other headers. Fixes #691.
11 years ago · 59c675a64c
40 changed files with 39 additions and 40 deletions
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@ -28,8 +28,8 @@
 #include <assert.h>
 #include <string.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "asmthumb.h"

 // wrapper around everything in this file
--- a/py/asmx64.c
+++ b/py/asmx64.c
@ -29,8 +29,8 @@
 #include <assert.h>
 #include <string.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"

 // wrapper around everything in this file
 #if MICROPY_EMIT_X64
--- a/py/binary.c
+++ b/py/binary.c
@ -29,8 +29,8 @@
 #include <string.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "binary.h"
--- a/py/builtintables.c
+++ b/py/builtintables.c
@ -26,8 +26,8 @@

 #include <stdlib.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
--- a/py/compile.c
+++ b/py/compile.c
@ -31,8 +31,8 @@
 #include <assert.h>
 #include <math.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
--- a/py/emitbc.c
+++ b/py/emitbc.c
@ -30,8 +30,8 @@
 #include <string.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
--- a/py/emitcommon.c
+++ b/py/emitcommon.c
@ -28,8 +28,8 @@
 #include <stdint.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
--- a/py/emitcpy.c
+++ b/py/emitcpy.c
@ -30,8 +30,8 @@
 #include <string.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
--- a/py/emitglue.c
+++ b/py/emitglue.c
@ -30,8 +30,8 @@
 #include <string.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"
--- a/py/emitinlinethumb.c
+++ b/py/emitinlinethumb.c
@ -30,8 +30,8 @@
 #include <stdarg.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
--- a/py/emitnative.c
+++ b/py/emitnative.c
@ -48,8 +48,8 @@
 #include <string.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
--- a/py/emitpass1.c
+++ b/py/emitpass1.c
@ -28,8 +28,8 @@
 #include <stdint.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
--- a/py/gc.c
+++ b/py/gc.c
@ -33,7 +33,6 @@
 #include "misc.h"
 #include "gc.h"

-#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"
--- a/py/lexer.c
+++ b/py/lexer.c
@ -32,8 +32,8 @@
 #include <stdio.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"

--- a/py/lexerstr.c
+++ b/py/lexerstr.c
@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"

--- a/py/lexerunix.c
+++ b/py/lexerunix.c
@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"

 #if MICROPY_HELPER_LEXER_UNIX

--- a/py/malloc.c
+++ b/py/malloc.c
@ -28,8 +28,8 @@
 #include <stdlib.h>
 #include <string.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"

 #if 0 // print debugging info
 #define DEBUG_printf DEBUG_printf
--- a/py/map.c
+++ b/py/map.c
@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"
--- a/py/modarray.c
+++ b/py/modarray.c
@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
--- a/py/modcmath.c
+++ b/py/modcmath.c
@ -26,8 +26,8 @@

 #include <math.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
--- a/py/modcollections.c
+++ b/py/modcollections.c
@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
--- a/py/modgc.c
+++ b/py/modgc.c
@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
--- a/py/modio.c
+++ b/py/modio.c
@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
--- a/py/modmath.c
+++ b/py/modmath.c
@ -26,8 +26,8 @@

 #include <math.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
--- a/py/modstruct.c
+++ b/py/modstruct.c
@ -27,8 +27,8 @@

 #include <assert.h>
 #include <string.h>
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
--- a/py/modsys.c
+++ b/py/modsys.c
@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
--- a/py/mpz.c
+++ b/py/mpz.c
@ -30,8 +30,8 @@
 #include <string.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "mpz.h"

 #if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_MPZ
--- a/py/objenumerate.c
+++ b/py/objenumerate.c
@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"
--- a/py/parse.c
+++ b/py/parse.c
@ -30,8 +30,8 @@
 #include <assert.h>
 #include <string.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parsenumbase.h"
--- a/py/parsehelper.c
+++ b/py/parsehelper.c
@ -29,8 +29,8 @@
 #include <stdint.h>
 #include <stdio.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
--- a/py/parsenum.c
+++ b/py/parsenum.c
@ -27,8 +27,8 @@
 #include <stdbool.h>
 #include <stdlib.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "nlr.h"
 #include "obj.h"
--- a/py/parsenumbase.c
+++ b/py/parsenumbase.c
@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "parsenumbase.h"

 // find real radix base, and strip preceding '0x', '0o' and '0b'
--- a/py/pfenv.c
+++ b/py/pfenv.c
@ -27,8 +27,8 @@
 #include <stdint.h>
 #include <string.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "mpz.h"
--- a/py/qstr.c
+++ b/py/qstr.c
@ -27,8 +27,8 @@
 #include <assert.h>
 #include <string.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"

 // NOTE: we are using linear arrays to store and search for qstr's (unique strings, interned strings)
--- a/py/repl.c
+++ b/py/repl.c
@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "repl.h"

 #if MICROPY_HELPER_REPL
--- a/py/scope.c
+++ b/py/scope.c
@ -29,8 +29,8 @@
 #include <stdio.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "parse.h"
--- a/py/smallint.c
+++ b/py/smallint.c
@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "smallint.h"
--- a/py/unicode.c
+++ b/py/unicode.c
@ -26,8 +26,8 @@

 #include <stdint.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"

 // attribute flags
 #define FL_PRINT (0x01)
--- a/py/vstr.c
+++ b/py/vstr.c
@ -29,8 +29,8 @@
 #include <stdarg.h>
 #include <string.h>
 #include <assert.h>
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"

 // returned value is always at least 1 greater than argument
 #define ROUND_ALLOC(a) (((a) & ((~0) - 7)) + 8)