summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2024-01-15 11:44:21 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2024-01-16 17:17:14 -0800
commit4aa0f5f13cc9839999965676943993cf371eec92 (patch)
treeff1ba3d5ebc21873ba56fd08bfd7597492e20093
parent5c423d4937fb3d5d609df75beb97d8047780f2cf (diff)
Quiet -Wredundant-decls from xorg/os.h fallbacks for new libc functions
The Xorg headers provide their own versions of strlcat, strlcpy, and timingsafe_memcmp for platforms that don't have them in libc yet, but rely on configure to set HAVE_* defines to determine if they should be defined in the headers. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index fabe166..0a7e6c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,8 +62,6 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
PKG_CHECK_MODULES(DRI, [libdrm >= 2.2 xf86driproto])
sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
-# Checks for libraries.
-
AC_CHECK_FILE([${sdkdir}/dri.h],
[have_dri_h="yes"], [have_dri_h="no"])
AC_CHECK_FILE([${sdkdir}/sarea.h],
@@ -103,6 +101,11 @@ AC_MSG_CHECKING([whether to include XAA support])
AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
AC_MSG_RESULT([$XAA])
+# Checks for library functions
+# We don't use strlcat, strlcpy, or timingsafe_memcmp, but check to quiet
+# -Wredundant-decls warning from xorg/os.h which will otherwise redefine them.
+AC_CHECK_FUNCS([strlcat strlcpy timingsafe_memcmp])
+
AC_SUBST([moduledir])
DRIVER_NAME=xgixp