From: Greg V <greg@unrelenting.technology>
Date: Sat, 26 May 2018 21:36:30 +0000 (+0300)
Subject: i965/tiled_memcpy: avoid creating bswap32 if it exists as a macro (e.g. on FreeBSD)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c00ee00031dd38a3c12d6661eba5f43d8a422e02;p=mesa.git

i965/tiled_memcpy: avoid creating bswap32 if it exists as a macro (e.g. on FreeBSD)

Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
---

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.