diff options
| author | John R. Lenton <jlenton@gmail.com> | 2014-01-13 23:09:04 +0000 |
|---|---|---|
| committer | John R. Lenton <jlenton@gmail.com> | 2014-01-13 23:09:04 +0000 |
| commit | f5a0a7d2b30d390f03dd0b6f8866ec619d2c5ee3 (patch) | |
| tree | ae93f78ed97e4d820150a7b0d8c026f94cfb790e /py/builtinimport.c | |
| parent | 189c8e1cc46896382b6d19da8b89a4cc4f7e3864 (diff) | |
| parent | ca318bba0d97c66d8fb14a089d8fa269a0e1b424 (diff) | |
| download | micropython-f5a0a7d2b30d390f03dd0b6f8866ec619d2c5ee3.tar.gz micropython-f5a0a7d2b30d390f03dd0b6f8866ec619d2c5ee3.zip | |
Merge remote-tracking branch 'upstream/master' into containment
Diffstat (limited to 'py/builtinimport.c')
| -rw-r--r-- | py/builtinimport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/builtinimport.c b/py/builtinimport.c index 90a0fc3394..33576e3f0e 100644 --- a/py/builtinimport.c +++ b/py/builtinimport.c @@ -18,7 +18,7 @@ #include "map.h" #include "builtin.h" -mp_obj_t mp_builtin___import__(int n, mp_obj_t *args) { +mp_obj_t mp_builtin___import__(int n_args, mp_obj_t *args) { /* printf("import:\n"); for (int i = 0; i < n; i++) { |