[xsrc/trunk]: xsrc/external/mit/MesaLib/dist/src/intel/isl Avoid conflict wit...

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/96cff8a9e399
branches:  trunk
changeset: 10399:96cff8a9e399
user:      maya <maya%NetBSD.org@localhost>
date:      Tue Sep 24 20:07:16 2019 +0000

description:
Avoid conflict with netbsd's highly visible bswap32 definition.

Re-patching, patch was lost in a rename.

diffstat:

 external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c |  5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diffs (22 lines):

diff -r a201841936f9 -r 96cff8a9e399 external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c
--- a/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c        Tue Sep 24 19:49:00 2019 +0000
+++ b/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c        Tue Sep 24 20:07:16 2019 +0000
@@ -64,6 +64,10 @@
    return (n >> d) | (n << (32 - d));
 }
 
+/* Handle conflicting declaration and conflicting macro in netbsd */
+#undef bswap32
+#define bswap32(n) __builtin_bswap32(n)
+#if 0
 static inline uint32_t
 bswap32(uint32_t n)
 {
@@ -76,6 +80,7 @@
           (n << 24);
 #endif
 }
+#endif
 
 /**
  * Copy RGBA to BGRA - swap R and B.