diff options
| author | blmorris <bryan.morrissey@gmail.com> | 2014-07-21 12:50:10 -0400 |
|---|---|---|
| committer | blmorris <bryan.morrissey@gmail.com> | 2014-07-21 12:50:10 -0400 |
| commit | 721d6240c951d7f38289fdfb702536dfa155fdd8 (patch) | |
| tree | 84ba9fba1218648f73f38346b30ad847437d3046 /teensy/modpyb.c | |
| parent | ef204733d6abc31b09e4e7823d4665fafebd87ed (diff) | |
| parent | 4038f513ea0a6be75ecbc4d8ab2bbe2349524bca (diff) | |
| download | micropython-721d6240c951d7f38289fdfb702536dfa155fdd8.tar.gz micropython-721d6240c951d7f38289fdfb702536dfa155fdd8.zip | |
Merge https://github.com/blmorris/micropython into Myriad2
Diffstat (limited to 'teensy/modpyb.c')
| -rw-r--r-- | teensy/modpyb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/teensy/modpyb.c b/teensy/modpyb.c index 435b198d0b..64b9bda2d9 100644 --- a/teensy/modpyb.c +++ b/teensy/modpyb.c @@ -29,8 +29,8 @@ #include <mk20dx128.h> #include "Arduino.h" -#include "misc.h" #include "mpconfig.h" +#include "misc.h" #include "teensy_hal.h" @@ -328,8 +328,8 @@ STATIC const mp_obj_dict_t pyb_module_globals = { .map = { .all_keys_are_qstrs = 1, .table_is_fixed_array = 1, - .used = ARRAY_SIZE(pyb_module_globals_table), - .alloc = ARRAY_SIZE(pyb_module_globals_table), + .used = MP_ARRAY_SIZE(pyb_module_globals_table), + .alloc = MP_ARRAY_SIZE(pyb_module_globals_table), .table = (mp_map_elem_t*)pyb_module_globals_table, }, }; |