diff options
| author | John R. Lenton <jlenton@gmail.com> | 2014-01-13 23:14:35 +0000 |
|---|---|---|
| committer | John R. Lenton <jlenton@gmail.com> | 2014-01-13 23:14:35 +0000 |
| commit | 93451002f04e0b89e41e1faa82f86e937bb219f1 (patch) | |
| tree | 478f8fedae2b08f12181c98a4a3d1c4cdf19403d /py/builtinimport.c | |
| parent | 88cb1e60e0b780d71e9c2d7b0acafa71ba3ea318 (diff) | |
| parent | ca318bba0d97c66d8fb14a089d8fa269a0e1b424 (diff) | |
| download | micropython-93451002f04e0b89e41e1faa82f86e937bb219f1.tar.gz micropython-93451002f04e0b89e41e1faa82f86e937bb219f1.zip | |
Merge remote-tracking branch 'upstream/master' into builtins
Conflicts:
py/builtin.c
py/builtin.h
py/runtime.c
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++) { |