path: root/include/endian.h
diff options
authorRich Felker <>2012-09-02 12:46:06 -0400
committerRich Felker <>2012-09-02 12:46:06 -0400
commitfb247fafa04ee52dda816355ab0461132297b9a4 (patch)
tree25c815d12a2beb2f9faaa0cc0308c1274beded6e /include/endian.h
parent3f62f76cab46fbd28248ed251a88278c6ea1be3a (diff)
avoid "inline" in public headers for strict c89 compatibility
while musl itself requires a c99 compiler, some applications insist on being compiled with c89 compilers, and use of "inline" in the headers was breaking them. much of this had been avoided already by just skipping the inline keyword in pre-c99 compilers or modes, but this new unified solution is cleaner and may/should result in better code generation in the default gcc configuration.
Diffstat (limited to 'include/endian.h')
1 files changed, 7 insertions, 12 deletions
diff --git a/include/endian.h b/include/endian.h
index 41ca1711..528cef31 100644
--- a/include/endian.h
+++ b/include/endian.h
@@ -1,6 +1,10 @@
#ifndef _ENDIAN_H
#define _ENDIAN_H
+#if __STDC_VERSION__ >= 199901L || defined(__cplusplus)
+#define __inline inline
#define __LITTLE_ENDIAN 1234
#define __BIG_ENDIAN 4321
#define __PDP_ENDIAN 3412
@@ -20,26 +24,17 @@
#include <stdint.h>
-#if __STDC_VERSION__ >= 199901L
-static uint16_t __bswap16(uint16_t __x)
+static __inline uint16_t __bswap16(uint16_t __x)
return __x<<8 | __x>>8;
-#if __STDC_VERSION__ >= 199901L
-static uint32_t __bswap32(uint32_t __x)
+static __inline uint32_t __bswap32(uint32_t __x)
return __x>>24 | __x>>8&0xff00 | __x<<8&0xff0000 | __x<<24;
-#if __STDC_VERSION__ >= 199901L
-static uint64_t __bswap64(uint64_t __x)
+static __inline uint64_t __bswap64(uint64_t __x)
return __bswap32(__x)+0ULL<<32 | __bswap32(__x>>32);