From c00ee00031dd38a3c12d6661eba5f43d8a422e02 Mon Sep 17 00:00:00 2001 From: Greg V Date: Sun, 27 May 2018 00:36:30 +0300 Subject: [PATCH] i965/tiled_memcpy: avoid creating bswap32 if it exists as a macro (e.g. on FreeBSD) Reviewed-by: Eric Engestrom --- src/intel/isl/isl_tiled_memcpy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/intel/isl/isl_tiled_memcpy.c b/src/intel/isl/isl_tiled_memcpy.c index 7df7835f9ab..8771533dbab 100644 --- a/src/intel/isl/isl_tiled_memcpy.c +++ b/src/intel/isl/isl_tiled_memcpy.c @@ -64,6 +64,8 @@ ror(uint32_t n, uint32_t d) return (n >> d) | (n << (32 - d)); } +// bswap32 already exists as a macro on some platforms (FreeBSD) +#ifndef bswap32 static inline uint32_t bswap32(uint32_t n) { @@ -76,6 +78,7 @@ bswap32(uint32_t n) (n << 24); #endif } +#endif /** * Copy RGBA to BGRA - swap R and B. -- 2.30.2