diff options
| author | John R. Lenton | 2014-01-14 23:58:05 +0000 |
|---|---|---|
| committer | John R. Lenton | 2014-01-14 23:58:05 +0000 |
| commit | ff8007c7d6497b108e8abe80ab3311945a03fe52 (patch) | |
| tree | e2f6974d6476cc46b7414ba0626cb519142c3e3d /py/objlist.c | |
| parent | 9daa78943e58602f74c89a2b5b1ed225f4ccf6cc (diff) | |
| parent | c6920d31e2b03205fe2851f74a6a4b48d0165608 (diff) | |
Merge remote-tracking branch 'upstream/master' into builtins
Diffstat (limited to 'py/objlist.c')
| -rw-r--r-- | py/objlist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/py/objlist.c b/py/objlist.c index f806dfae8..100a02f3c 100644 --- a/py/objlist.c +++ b/py/objlist.c @@ -248,7 +248,7 @@ static void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, bool r } } -mp_obj_t list_sort(mp_obj_t args, mp_map_t *kwargs) { +mp_obj_t mp_obj_list_sort(mp_obj_t args, mp_map_t *kwargs) { mp_obj_t *args_items = NULL; uint args_len = 0; @@ -381,7 +381,7 @@ static MP_DEFINE_CONST_FUN_OBJ_3(list_insert_obj, list_insert); static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop); static MP_DEFINE_CONST_FUN_OBJ_2(list_remove_obj, list_remove); static MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse); -static MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, 0, list_sort); +static MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, 0, mp_obj_list_sort); static const mp_method_t list_type_methods[] = { { "append", &list_append_obj }, |