summaryrefslogtreecommitdiffstatshomepage
path: root/py/modsys.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-06-25 04:10:34 +0100
committerDamien George <damien.p.george@gmail.com>2014-06-25 04:10:34 +0100
commite973acde81462de0c205f27db2642a08022fb3a8 (patch)
treec6862ead76ae12979b3c3d6d1ec20774884c72ef /py/modsys.c
parent780e54cdc3491409060f90003ca64fcdd3f9f1e6 (diff)
parent939c2e7f448fbe6b44d0079d2fc33c7ac7eb32d0 (diff)
downloadmicropython-e973acde81462de0c205f27db2642a08022fb3a8.tar.gz
micropython-e973acde81462de0c205f27db2642a08022fb3a8.zip
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/modsys.c')
-rw-r--r--py/modsys.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/py/modsys.c b/py/modsys.c
index a99db1b7f8..1e7f7eff7f 100644
--- 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"
@@ -87,8 +87,8 @@ STATIC const mp_obj_dict_t mp_module_sys_globals = {
.map = {
.all_keys_are_qstrs = 1,
.table_is_fixed_array = 1,
- .used = ARRAY_SIZE(mp_module_sys_globals_table),
- .alloc = ARRAY_SIZE(mp_module_sys_globals_table),
+ .used = MP_ARRAY_SIZE(mp_module_sys_globals_table),
+ .alloc = MP_ARRAY_SIZE(mp_module_sys_globals_table),
.table = (mp_map_elem_t*)mp_module_sys_globals_table,
},
};