diff options
author | Damien George <damien.p.george@gmail.com> | 2014-04-12 17:53:05 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-04-12 17:53:05 +0100 |
commit | 2813cb6043fa9884b87b7ce23a85e97a9ed304e7 (patch) | |
tree | 7528c3c0ba52cd09271b7b25a604e95c24905d9a | |
parent | d6c5d398fe4c5d46073ab94a75c932899a730472 (diff) | |
download | micropython-2813cb6043fa9884b87b7ce23a85e97a9ed304e7.tar.gz micropython-2813cb6043fa9884b87b7ce23a85e97a9ed304e7.zip |
py: Add 'static' to inline function MP_BOOL; remove category_t.
Small fixes to get it compiling with ARMCC. I have no idea why
category_t was in the enum definition for qstrs...
-rw-r--r-- | py/obj.h | 2 | ||||
-rw-r--r-- | py/qstr.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -398,7 +398,7 @@ mp_obj_t mp_obj_len_maybe(mp_obj_t o_in); /* may return MP_OBJ_NULL */ // bool // TODO make lower case when it has proven itself -inline mp_obj_t MP_BOOL(machine_int_t x) { return x ? mp_const_true : mp_const_false; } +static inline mp_obj_t MP_BOOL(machine_int_t x) { return x ? mp_const_true : mp_const_false; } // cell mp_obj_t mp_obj_cell_get(mp_obj_t self_in); @@ -12,7 +12,7 @@ enum { #include "build/py/qstrdefs.generated.h" #undef Q MP_QSTR_number_of, -} category_t; +}; typedef machine_uint_t qstr; |