Skip to content

Commit

Permalink
lib: add explicit casts to byteorder macros
Browse files Browse the repository at this point in the history
Some consumers of lib.h are in C++ and therefore they try to compile
byteorder.h as C++ code.  C++ compilers don't like the implicit void *
-> struct anything * conversion, so we squelch those by adding explicit
casts.
  • Loading branch information
Josef 'Jeff' Sipek committed Aug 1, 2017
1 parent a6fdcbc commit 0a12799
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/lib/byteorder.h
Expand Up @@ -125,7 +125,7 @@ static inline uint8_t bswap_8(uint8_t in)
*/
static inline uint64_t be64_to_cpu_unaligned(const void *in)
{
const uint8_t *p = in;
const uint8_t *p = (const uint8_t *) in;

return (((uint64_t) p[0] << 56) |
((uint64_t) p[1] << 48) |
Expand All @@ -139,7 +139,7 @@ static inline uint64_t be64_to_cpu_unaligned(const void *in)

static inline void cpu64_to_be_unaligned(uint64_t in, void *out)
{
uint8_t *p = out;
uint8_t *p = (uint8_t *) out;

p[0] = (in >> 56) & 0xff;
p[1] = (in >> 48) & 0xff;
Expand All @@ -153,7 +153,7 @@ static inline void cpu64_to_be_unaligned(uint64_t in, void *out)

static inline uint32_t be32_to_cpu_unaligned(const void *in)
{
const uint8_t *p = in;
const uint8_t *p = (const uint8_t *) in;

return (((uint32_t) p[0] << 24) |
((uint32_t) p[1] << 16) |
Expand All @@ -163,7 +163,7 @@ static inline uint32_t be32_to_cpu_unaligned(const void *in)

static inline void cpu32_to_be_unaligned(uint32_t in, void *out)
{
uint8_t *p = out;
uint8_t *p = (uint8_t *) out;

p[0] = (in >> 24) & 0xff;
p[1] = (in >> 16) & 0xff;
Expand All @@ -173,15 +173,15 @@ static inline void cpu32_to_be_unaligned(uint32_t in, void *out)

static inline uint16_t be16_to_cpu_unaligned(const void *in)
{
const uint8_t *p = in;
const uint8_t *p = (const uint8_t *) in;

return (((uint16_t) p[0] << 8) |
((uint16_t) p[1]));
}

static inline void cpu16_to_be_unaligned(uint16_t in, void *out)
{
uint8_t *p = out;
uint8_t *p = (uint8_t *) out;

p[0] = (in >> 8) & 0xff;
p[1] = in & 0xff;
Expand All @@ -194,7 +194,7 @@ static inline uint8_t be8_to_cpu_unaligned(const void *in)

static inline void cpu8_to_be_unaligned(uint8_t in, void *out)
{
uint8_t *p = out;
uint8_t *p = (uint8_t *) out;

*p = in;
}
Expand Down

0 comments on commit 0a12799

Please sign in to comment.