diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-05 23:33:37 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-05 23:33:37 +0100 |
| commit | 4e1ed82583081a45501723bf9c920e8e776719f4 (patch) | |
| tree | 8a0274c0ad1b289ae99c954554d2959da4324162 | |
| parent | d0e824387e9bb50b03544969bccced4adf2ac7df (diff) | |
| parent | 080d99b7a8be4e98926671175cf1f42173d41d09 (diff) | |
| download | micropython-4e1ed82583081a45501723bf9c920e8e776719f4.tar.gz micropython-4e1ed82583081a45501723bf9c920e8e776719f4.zip | |
Merge branch 'master' of github.com:micropython/micropython
| -rw-r--r-- | py/builtin.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/py/builtin.c b/py/builtin.c index fc037f12f3..7a01731d06 100644 --- a/py/builtin.c +++ b/py/builtin.c @@ -411,15 +411,6 @@ STATIC mp_obj_t mp_builtin_getattr(uint n_args, const mp_obj_t *args) { MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_getattr_obj, 2, 3, mp_builtin_getattr); - -STATIC mp_obj_t mp_builtin_globals() { - return mp_globals_get(); -} - -MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_globals_obj, mp_builtin_globals); - -STATIC mp_obj_t mp_builtin_locals() { - return mp_locals_get(); -} - -MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_locals_obj, mp_builtin_locals); +// These two are defined in terms of MicroPython API functions right away +MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_globals_obj, mp_globals_get); +MP_DEFINE_CONST_FUN_OBJ_0(mp_builtin_locals_obj, mp_locals_get); |