Merge branch 'master' of github.com:fincs/picasso

fincs · fincs · commit ae2f31ab016f · 2015-08-21T12:41:57.000+02:00
diff --git a/source/types.h b/source/types.h
@@ -24,6 +24,7 @@ typedef uint8_t u8;
 #define __ORDER_BIG_ENDIAN__ BIG_ENDIAN
 #endif
 
+#ifndef __llvm__
 static inline uint16_t __builtin_bswap16(uint16_t x)
 {
 	return ((x << 8) & 0xff00) | ((x >> 8) & 0x00ff);
@@ -43,6 +44,7 @@ static inline uint64_t __builtin_bswap64(uint64_t x)
 	      ((uint64_t)__builtin_bswap32(x&0xFFFFFFFF) << 32);
 }
 #endif
+#endif
 
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 #define be_dword(a)  __builtin_bswap64(a)

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ typedef uint8_t u8;`
`24`	`24`	`#define __ORDER_BIG_ENDIAN__ BIG_ENDIAN`
`25`	`25`	`#endif`
`26`	`26`
	`27`	`+#ifndef __llvm__`
`27`	`28`	`static inline uint16_t __builtin_bswap16(uint16_t x)`
`28`	`29`	`{`
`29`	`30`	`return ((x << 8) & 0xff00) \| ((x >> 8) & 0x00ff);`
`@@ -43,6 +44,7 @@ static inline uint64_t __builtin_bswap64(uint64_t x)`
`43`	`44`	`((uint64_t)__builtin_bswap32(x&0xFFFFFFFF) << 32);`
`44`	`45`	`}`
`45`	`46`	`#endif`
	`47`	`+#endif`
`46`	`48`
`47`	`49`	`#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__`
`48`	`50`	`#define be_dword(a) __builtin_bswap64(a)`