Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From dd4291265b7b3d7d7ffa1d8adf32781ae25dbfeb Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 15 Jul 2017 00:29:42 -0700 |
| 4 | Subject: [PATCH] makeguids: Do not use __bswap_constant_{16|32} macros |
| 5 | |
| 6 | not available on musl |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | |
| 10 | --- |
| 11 | src/makeguids.c | 8 ++++---- |
| 12 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 13 | |
| 14 | diff --git a/src/makeguids.c b/src/makeguids.c |
| 15 | index da2f5f7..daf821a 100644 |
| 16 | --- a/src/makeguids.c |
| 17 | +++ b/src/makeguids.c |
| 18 | @@ -155,13 +155,13 @@ main(int argc, char *argv[]) |
| 19 | #if BYTE_ORDER == BIG_ENDIAN\n\ |
| 20 | #define cpu_to_be32(n) (n)\n\ |
| 21 | #define cpu_to_be16(n) (n)\n\ |
| 22 | -#define cpu_to_le32(n) (__bswap_constant_32(n))\n\ |
| 23 | -#define cpu_to_le16(n) (__bswap_constant_16(n))\n\ |
| 24 | +#define cpu_to_le32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ |
| 25 | +#define cpu_to_le16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\ |
| 26 | #else\n\ |
| 27 | #define cpu_to_le32(n) (n)\n\ |
| 28 | #define cpu_to_le16(n) (n)\n\ |
| 29 | -#define cpu_to_be32(n) (__bswap_constant_32(n))\n\ |
| 30 | -#define cpu_to_be16(n) (__bswap_constant_16(n))\n\ |
| 31 | +#define cpu_to_be32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ |
| 32 | +#define cpu_to_be16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\ |
| 33 | #endif\n\ |
| 34 | """); |
| 35 | |