py,extmod,stmhal: Use "static inline" for funcs that should be inline.

dpgeorge · dpgeorge · commit 0f12082f5b7d · 2017-08-02T13:42:34.000+10:00
"STATIC inline" can expand to "inline" if STATIC is defined to nothing, and
this case can lead to link errors.
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
@@ -281,13 +281,13 @@ STATIC mp_obj_t uctypes_struct_sizeof(mp_obj_t obj_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(uctypes_struct_sizeof_obj, uctypes_struct_sizeof);
 
-STATIC inline mp_obj_t get_unaligned(uint val_type, byte *p, int big_endian) {
+static inline mp_obj_t get_unaligned(uint val_type, byte *p, int big_endian) {
     char struct_type = big_endian ? '>' : '<';
     static const char type2char[16] = "BbHhIiQq------fd";
     return mp_binary_get_val(struct_type, type2char[val_type], &p);
 }
 
-STATIC inline void set_unaligned(uint val_type, byte *p, int big_endian, mp_obj_t val) {
+static inline void set_unaligned(uint val_type, byte *p, int big_endian, mp_obj_t val) {
     char struct_type = big_endian ? '>' : '<';
     static const char type2char[16] = "BbHhIiQq------fd";
     mp_binary_set_val(struct_type, type2char[val_type], val, &p);
diff --git 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);
diff --git a/stmhal/i2c.c b/stmhal/i2c.c
@@ -513,7 +513,7 @@ STATIC HAL_StatusTypeDef i2c_wait_dma_finished(I2C_HandleTypeDef *i2c, uint32_t
 /******************************************************************************/
 /* MicroPython bindings                                                       */
 
-STATIC inline bool in_master_mode(pyb_i2c_obj_t *self) { return self->i2c->Init.OwnAddress1 == PYB_I2C_MASTER_ADDRESS; }
+static inline bool in_master_mode(pyb_i2c_obj_t *self) { return self->i2c->Init.OwnAddress1 == PYB_I2C_MASTER_ADDRESS; }
 
 STATIC void pyb_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_i2c_obj_t *self = self_in;

Original file line number	Diff line number	Diff line change
`@@ -281,13 +281,13 @@ STATIC mp_obj_t uctypes_struct_sizeof(mp_obj_t obj_in) {`
`281`	`281`	`}`
`282`	`282`	`STATIC MP_DEFINE_CONST_FUN_OBJ_1(uctypes_struct_sizeof_obj, uctypes_struct_sizeof);`
`283`	`283`
`284`		`-STATIC inline mp_obj_t get_unaligned(uint val_type, byte *p, int big_endian) {`
	`284`	`+static inline mp_obj_t get_unaligned(uint val_type, byte *p, int big_endian) {`
`285`	`285`	`char struct_type = big_endian ? '>' : '<';`
`286`	`286`	`static const char type2char[16] = "BbHhIiQq------fd";`
`287`	`287`	`return mp_binary_get_val(struct_type, type2char[val_type], &p);`
`288`	`288`	`}`
`289`	`289`
`290`		`-STATIC inline void set_unaligned(uint val_type, byte *p, int big_endian, mp_obj_t val) {`
	`290`	`+static inline void set_unaligned(uint val_type, byte *p, int big_endian, mp_obj_t val) {`
`291`	`291`	`char struct_type = big_endian ? '>' : '<';`
`292`	`292`	`static const char type2char[16] = "BbHhIiQq------fd";`
`293`	`293`	`mp_binary_set_val(struct_type, type2char[val_type], val, &p);`