X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Fendian.h;h=1bd444518ab5febecb6cec6e2e7693c29359d082;hp=6e14716e07635cc8b2d7295ae597b820f4d038b5;hb=1ab59de81e94e7802f85d314a709f8350a0e9b65;hpb=8705a0f1afdf6e6eb5d2e325dafb3be7e58f259c

diff --git a/include/endian.h b/include/endian.h
index 6e14716e..1bd44451 100644
--- a/include/endian.h
+++ b/include/endian.h
@@ -1,11 +1,17 @@
 #ifndef _ENDIAN_H
 #define _ENDIAN_H
 
+#include <features.h>
+
 #define __LITTLE_ENDIAN 1234
 #define __BIG_ENDIAN 4321
 #define __PDP_ENDIAN 3412
 
+#if defined(__GNUC__) && defined(__BYTE_ORDER__)
+#define __BYTE_ORDER __BYTE_ORDER__
+#else
 #include <bits/endian.h>
+#endif
 
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 
@@ -16,19 +22,19 @@
 
 #include <stdint.h>
 
-static inline uint16_t __bswap16(uint16_t __x)
+static __inline uint16_t __bswap16(uint16_t __x)
 {
 	return __x<<8 | __x>>8;
 }
 
-static inline 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;
 }
 
-static inline uint64_t __bswap64(uint64_t __x)
+static __inline uint64_t __bswap64(uint64_t __x)
 {
-	return __bswap_32(__x)+0ULL<<32 | __bswap_32(__x>>32);
+	return __bswap32(__x)+0ULL<<32 | __bswap32(__x>>32);
 }
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN