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...
2014-04-12 17:53:05 +01:00 · 2014-04-12 17:53:05 +01:00 · 2813cb6043
parent d6c5d398fe
commit 2813cb6043
2 changed files with 2 additions and 2 deletions
--- a/py/obj.h
+++ b/py/obj.h
@ -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);
--- a/py/qstr.h
+++ b/py/qstr.h
@ -12,7 +12,7 @@ enum {
 #include "build/py/qstrdefs.generated.h"
 #undef Q
    MP_QSTR_number_of,
-} category_t;
+};

 typedef machine_uint_t qstr;