From f6932d650620d3753b5a18df5131227276260f74 Mon Sep 17 00:00:00 2001
From: Emmanuel Blot
Date: Thu, 19 Jun 2014 18:54:34 +0200
Subject: Prefix ARRAY_SIZE with micropython prefix MP_

---
 py/modarray.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'py/modarray.c')

diff --git a/py/modarray.c b/py/modarray.c
index a741a0ecb..2b9f531f9 100644
--- a/py/modarray.c
+++ b/py/modarray.c
@@ -40,8 +40,8 @@ STATIC const mp_obj_dict_t mp_module_array_globals = {
     .map = {
         .all_keys_are_qstrs = 1,
         .table_is_fixed_array = 1,
-        .used = ARRAY_SIZE(mp_module_array_globals_table),
-        .alloc = ARRAY_SIZE(mp_module_array_globals_table),
+        .used = MP_ARRAY_SIZE(mp_module_array_globals_table),
+        .alloc = MP_ARRAY_SIZE(mp_module_array_globals_table),
         .table = (mp_map_elem_t*)mp_module_array_globals_table,
     },
 };
-- 
cgit v1.2.3


From 59c675a64c1d9757d50ad4627da67a6f996a99fb Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky
Date: Sat, 21 Jun 2014 22:43:22 +0300
Subject: py: Include mpconfig.h before all other includes.

It defines types used by all other headers.

Fixes #691.
---
 py/modarray.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'py/modarray.c')

diff --git a/py/modarray.c b/py/modarray.c
index 2b9f531f9..3ff567f1d 100644
--- 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"
-- 
cgit v1.2.3