summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authornia <nia@NetBSD.org>2024-05-04 02:47:08 +0200
committerMarge Bot <emma+marge@anholt.net>2024-06-02 18:41:52 +0000
commitb65036af74bbb5084587d3d5743b8b97292235bc (patch)
tree7ccfd8213785826099ff792aae4099216181f874 /configure.ac
parent1f81004bfc32e1200dc2224a73831248f5d38eeb (diff)
Avoid namespace collision: rename bswap_XX to radeon_bswap_XXHEADmaster
xorg-server includes its own bswap_16, bswap_32 etc macros in its misc.h. This is transcluded after radeon.h in some files. If the operating system defines bswap_XX in a way that is unsuitable for a function name (e.g. on NetBSD), this results in build failures. Signed-off-by: Nia Alarie <nia@NetBSD.org> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/merge_requests/23>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 58fb50eb..d44a2dda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,11 +254,11 @@ b = bswap16(a);
if test "$USE_SYS_ENDIAN_H" = "yes" ; then
AC_DEFINE([USE_SYS_ENDIAN_H], 1,
[Define to use byteswap macros from <sys/endian.h>])
- AC_DEFINE_UNQUOTED([bswap_16], ${BSWAP}16,
+ AC_DEFINE_UNQUOTED([radeon_bswap_16], ${BSWAP}16,
[Define to 16-bit byteswap macro])
- AC_DEFINE_UNQUOTED([bswap_32], ${BSWAP}32,
+ AC_DEFINE_UNQUOTED([radeon_bswap_32], ${BSWAP}32,
[Define to 32-bit byteswap macro])
- AC_DEFINE_UNQUOTED([bswap_64], ${BSWAP}64,
+ AC_DEFINE_UNQUOTED([radeon_bswap_64], ${BSWAP}64,
[Define to 64-bit byteswap macro])
fi
fi