Merge pull request #1413 from simonduq/pr/fix-inline-warning

Fix warning introduced by https://github.com/contiki-os/contiki/pull/1133
This commit is contained in:
Simon Duquennoy 2015-12-07 14:01:09 +01:00
commit eb3324fb87

View file

@ -92,7 +92,7 @@ le16_read(const void *ptr)
return ((uint16_t)p[1] << 8) | p[0]; return ((uint16_t)p[1] << 8) | p[0];
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
uint8_t CC_INLINE static uint8_t CC_INLINE
get_bits_in_byte(uint8_t *from, int bitpos, int vallen) get_bits_in_byte(uint8_t *from, int bitpos, int vallen)
{ {
uint16_t shifted_val; uint16_t shifted_val;