From 8a2dc5d188fb9ff456854103a4051352fda3107b Mon Sep 17 00:00:00 2001 From: Liav A Date: Wed, 19 Feb 2020 17:01:08 +0200 Subject: [PATCH] LibC: Fix big endian definitions --- Libraries/LibC/endian.h | 104 ++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/Libraries/LibC/endian.h b/Libraries/LibC/endian.h index a9bba78757..ebaf6cde3e 100644 --- a/Libraries/LibC/endian.h +++ b/Libraries/LibC/endian.h @@ -30,79 +30,79 @@ __BEGIN_DECLS -#define __LITTLE_ENDIAN 1234 -#define __BIG_ENDIAN 4321 -#define __PDP_ENDIAN 3412 +#define __LITTLE_ENDIAN 1234 +#define __BIG_ENDIAN 4321 +#define __PDP_ENDIAN 3412 #if defined(__GNUC__) && defined(__BYTE_ORDER__) -#define __BYTE_ORDER __BYTE_ORDER__ +# define __BYTE_ORDER __BYTE_ORDER__ #else -#include +# include #endif #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) -#include +# include static __inline uint16_t __bswap16(uint16_t x) { - return __builtin_bswap16(x); + return __builtin_bswap16(x); } static __inline uint32_t __bswap32(uint32_t x) { - return __builtin_bswap32(x); + return __builtin_bswap32(x); } static __inline uint64_t __bswap64(uint64_t x) { - return __builtin_bswap64(x); + return __builtin_bswap64(x); } -#define LITTLE_ENDIAN __LITTLE_ENDIAN -#define BIG_ENDIAN __BIG_ENDIAN -#define PDP_ENDIAN __PDP_ENDIAN -#define BYTE_ORDER __BYTE_ORDER +# define LITTLE_ENDIAN __LITTLE_ENDIAN +# define BIG_ENDIAN __BIG_ENDIAN +# define PDP_ENDIAN __PDP_ENDIAN +# define BYTE_ORDER __BYTE_ORDER -#if __BYTE_ORDER == __LITTLE_ENDIAN -#define htole16(x) ((uint16_t)(x)) -#define le16toh(x) ((uint16_t)(x)) -#define letoh16(x) ((uint16_t)(x)) -#define htole32(x) ((uint32_t)(x)) -#define le32toh(x) ((uint32_t)(x)) -#define letoh32(x) ((uint32_t)(x)) -#define htole64(x) ((uint64_t)(x)) -#define le64toh(x) ((uint64_t)(x)) -#define letoh64(x) ((uint64_t)(x)) -#define htobe16(x) (__builtin_bswap16(x)) -#define be16toh(x) (__builtin_bswap16(x)) -#define betoh16(x) (__builtin_bswap16(x)) -#define htobe32(x) (__builtin_bswap32(x)) -#define be32toh(x) (__builtin_bswap32(x)) -#define betoh32(x) (__builtin_bswap32(x)) -#define htobe64(x) (__builtin_bswap64(x)) -#define be64toh(x) (__builtin_bswap64(x)) -#define betoh64(x) (__builtin_bswap64(x)) -#else -#define ltobe16(x) ((uint16_t)(x)) -#define le16toh(x) ((uint16_t)(x)) -#define letoh16(x) ((uint16_t)(x)) -#define htole32(x) ((uint32_t)(x)) -#define le32toh(x) ((uint32_t)(x)) -#define letoh32(x) ((uint32_t)(x)) -#define htole64(x) ((uint64_t)(x)) -#define le64toh(x) ((uint64_t)(x)) -#define letoh64(x) ((uint64_t)(x)) -#define htole16(x) (__builtin_bswap16(x)) -#define le16toh(x) (__builtin_bswap16(x)) -#define letoh16(x) (__builtin_bswap16(x)) -#define htole32(x) (__builtin_bswap32(x)) -#define le32toh(x) (__builtin_bswap32(x)) -#define letoh32(x) (__builtin_bswap32(x)) -#define htole64(x) (__builtin_bswap64(x)) -#define le64toh(x) (__builtin_bswap64(x)) -#define letoh64(x) (__builtin_bswap64(x)) -#endif +# if __BYTE_ORDER == __LITTLE_ENDIAN +# define htole16(x) ((uint16_t)(x)) +# define le16toh(x) ((uint16_t)(x)) +# define letoh16(x) ((uint16_t)(x)) +# define htole32(x) ((uint32_t)(x)) +# define le32toh(x) ((uint32_t)(x)) +# define letoh32(x) ((uint32_t)(x)) +# define htole64(x) ((uint64_t)(x)) +# define le64toh(x) ((uint64_t)(x)) +# define letoh64(x) ((uint64_t)(x)) +# define htobe16(x) (__builtin_bswap16(x)) +# define be16toh(x) (__builtin_bswap16(x)) +# define betoh16(x) (__builtin_bswap16(x)) +# define htobe32(x) (__builtin_bswap32(x)) +# define be32toh(x) (__builtin_bswap32(x)) +# define betoh32(x) (__builtin_bswap32(x)) +# define htobe64(x) (__builtin_bswap64(x)) +# define be64toh(x) (__builtin_bswap64(x)) +# define betoh64(x) (__builtin_bswap64(x)) +# else +# define htole16(x) (__builtin_bswap16(x)) +# define le16toh(x) (__builtin_bswap16(x)) +# define letoh16(x) (__builtin_bswap16(x)) +# define htole32(x) (__builtin_bswap32(x)) +# define le32toh(x) (__builtin_bswap32(x)) +# define letoh32(x) (__builtin_bswap32(x)) +# define htole64(x) (__builtin_bswap64(x)) +# define le64toh(x) (__builtin_bswap64(x)) +# define letoh64(x) (__builtin_bswap64(x)) +# define htobe16(x) ((uint16_t)(x)) +# define be16toh(x) ((uint16_t)(x)) +# define betoh16(x) ((uint16_t)(x)) +# define htobe32(x) ((uint32_t)(x)) +# define be32toh(x) ((uint32_t)(x)) +# define betoh32(x) ((uint32_t)(x)) +# define htobe64(x) ((uint64_t)(x)) +# define be64toh(x) ((uint64_t)(x)) +# define betoh64(x) ((uint64_t)(x)) +# endif #endif