Module Name:xsrc
Committed By: maya
Date: Tue Sep 24 20:07:16 UTC 2019
Modified Files:
xsrc/external/mit/MesaLib/dist/src/intel/isl: isl_tiled_memcpy.c
Log Message:
Avoid conflict with netbsd's highly visible bswap32 definition.
Re-patching, patch was lost in a rename.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c
diff -u xsrc/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c:1.1.1.1 Tue Sep 24 17:44:21 2019
+++ xsrc/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c Tue Sep 24 20:07:16 2019
@@ -64,6 +64,10 @@ ror(uint32_t n, uint32_t d)
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 @@ bswap32(uint32_t n)
(n << 24);
#endif
}
+#endif
/**
* Copy RGBA to BGRA - swap R and B.
