diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2024-08-02 08:41:00 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2024-08-02 08:41:00 +0200 |
| commit | 56c4a40008fe47ad1d46376b4146e034b8c50c5e (patch) | |
| tree | b6dc2d92cef762018f496c5aaa5228673c66a40e /src/radeon.h | |
| parent | d873aa20b4638a96a72696598dce4ceb2807c14a (diff) | |
| parent | b65036af74bbb5084587d3d5743b8b97292235bc (diff) | |
Merge remote-tracking branch 'origin/master' into obsdobsd
Diffstat (limited to 'src/radeon.h')
| -rw-r--r-- | src/radeon.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/radeon.h b/src/radeon.h index 68d7756a..6d1d21ee 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -125,27 +125,30 @@ RegionDuplicate(RegionPtr pOld) #if HAVE_BYTESWAP_H #include <byteswap.h> +#define radeon_bswap_16 bswap_16 +#define radeon_bswap_32 bswap_32 +#define radeon_bswap_64 bswap_64 #elif defined(USE_SYS_ENDIAN_H) #include <sys/endian.h> #else -#define bswap_16(value) \ +#define radeon_bswap_16(value) \ ((((value) & 0xff) << 8) | ((value) >> 8)) -#define bswap_32(value) \ - (((uint32_t)bswap_16((uint16_t)((value) & 0xffff)) << 16) | \ - (uint32_t)bswap_16((uint16_t)((value) >> 16))) +#define radeon_bswap_32(value) \ + (((uint32_t)radeon_bswap_16((uint16_t)((value) & 0xffff)) << 16) | \ + (uint32_t)radeon_bswap_16((uint16_t)((value) >> 16))) -#define bswap_64(value) \ - (((uint64_t)bswap_32((uint32_t)((value) & 0xffffffff)) \ +#define radeon_bswap_64(value) \ + (((uint64_t)radeon_bswap_32((uint32_t)((value) & 0xffffffff)) \ << 32) | \ - (uint64_t)bswap_32((uint32_t)((value) >> 32))) + (uint64_t)radeon_bswap_32((uint32_t)((value) >> 32))) #endif #if X_BYTE_ORDER == X_BIG_ENDIAN -#define le32_to_cpu(x) bswap_32(x) -#define le16_to_cpu(x) bswap_16(x) -#define cpu_to_le32(x) bswap_32(x) -#define cpu_to_le16(x) bswap_16(x) +#define le32_to_cpu(x) radeon_bswap_32(x) +#define le16_to_cpu(x) radeon_bswap_16(x) +#define cpu_to_le32(x) radeon_bswap_32(x) +#define cpu_to_le16(x) radeon_bswap_16(x) #else #define le32_to_cpu(x) (x) #define le16_to_cpu(x) (x) |