diff options
| author | Damien George <damien.p.george@gmail.com> | 2017-08-02 13:42:34 +1000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2017-08-02 13:42:34 +1000 |
| commit | 0f12082f5b7d957d920bce4e40ee589abce84e38 (patch) | |
| tree | d46bba868566636b3b7825dfdebc31da88725357 /py | |
| parent | ee0452509785faa41a3e15a3646130e35f3556cd (diff) | |
| download | micropython-0f12082f5b7d957d920bce4e40ee589abce84e38.tar.gz micropython-0f12082f5b7d957d920bce4e40ee589abce84e38.zip | |
py,extmod,stmhal: Use "static inline" for funcs that should be inline.
"STATIC inline" can expand to "inline" if STATIC is defined to nothing, and
this case can lead to link errors.
Diffstat (limited to 'py')
| -rw-r--r-- | py/modbuiltins.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/modbuiltins.c b/py/modbuiltins.c index 1711ae58b1..1c76b80739 100644 --- a/py/modbuiltins.c +++ b/py/modbuiltins.c @@ -540,7 +540,7 @@ STATIC mp_obj_t mp_builtin_sorted(size_t n_args, const mp_obj_t *args, mp_map_t MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_sorted_obj, 1, mp_builtin_sorted); // See mp_load_attr() if making any changes -STATIC inline mp_obj_t mp_load_attr_default(mp_obj_t base, qstr attr, mp_obj_t defval) { +static inline mp_obj_t mp_load_attr_default(mp_obj_t base, qstr attr, mp_obj_t defval) { mp_obj_t dest[2]; // use load_method, raising or not raising exception ((defval == MP_OBJ_NULL) ? mp_load_method : mp_load_method_maybe)(base, attr, dest); |