aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Richardson <arichardson@FreeBSD.org>2020-10-14 12:28:54 +0000
committerAlex Richardson <arichardson@FreeBSD.org>2020-10-14 12:28:54 +0000
commita525283161f88f2044200af7f8aac12c2c6819df (patch)
treebc5cecf2ac709f29c444729f2c8d96a165fdca62
parenta31993fece39b32ff45e7ef77c1b6e65ff832e37 (diff)
downloadsrc-a525283161f88f2044200af7f8aac12c2c6819df.tar.gz
src-a525283161f88f2044200af7f8aac12c2c6819df.zip
Fix more -Wundef warnings during bootstrap
Notes
Notes: svn path=/head/; revision=366699
-rw-r--r--kerberos5/include/config.h2
-rw-r--r--tools/build/Makefile4
-rw-r--r--tools/build/cross-build/include/common/sys/cdefs.h5
3 files changed, 3 insertions, 8 deletions
diff --git a/kerberos5/include/config.h b/kerberos5/include/config.h
index 86c7bfbca517..73aacf8dfa6e 100644
--- a/kerberos5/include/config.h
+++ b/kerberos5/include/config.h
@@ -975,7 +975,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
#define HAVE_STRVISX 1
/* Define to 1 if you have the `svis' function. */
-/* #undef HAVE_SVIS */
+#define HAVE_SVIS 1
/* Define if you have the function `swab'. */
#define HAVE_SWAB 1
diff --git a/tools/build/Makefile b/tools/build/Makefile
index 023c6cf99f6f..01a29ad730af 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -57,8 +57,8 @@ _WITH_STRSVIS!= grep -c strsvis ${HOST_INCLUDE_ROOT}/vis.h 2>/dev/null || true
.PATH: ${.CURDIR}/../../contrib/libc-vis
INCS+= vis.h
SRCS+= vis.c unvis.c
-CFLAGS.vis.c+= -I${.CURDIR}/../../contrib/libc-vis
-CFLAGS.unvis.c+= -I${.CURDIR}/../../contrib/libc-vis
+CFLAGS.vis.c+= -I${.CURDIR}/../../contrib/libc-vis -DHAVE_VIS=0 -DHAVE_SVIS=0
+CFLAGS.unvis.c+= -I${.CURDIR}/../../contrib/libc-vis -DHAVE_VIS=0 -DHAVE_SVIS=0
.endif
_WITH_REALLOCARRAY!= grep -c reallocarray ${HOST_INCLUDE_ROOT}/stdlib.h || true
diff --git a/tools/build/cross-build/include/common/sys/cdefs.h b/tools/build/cross-build/include/common/sys/cdefs.h
index 2bd57eef908d..c86369ab778a 100644
--- a/tools/build/cross-build/include/common/sys/cdefs.h
+++ b/tools/build/cross-build/include/common/sys/cdefs.h
@@ -190,11 +190,6 @@ typedef unsigned short u_short;
typedef unsigned int u_int;
typedef unsigned long u_long;
-/* This is needed so that BSNMP doesn't redeclare an incompatible version */
-#define HAVE_STRLCPY 1
-/* The compiler supports __func__ */
-#define HAVE_DECL___FUNC__ 1
-
/* On MacOS __CONCAT is defined as x ## y, which won't expand macros */
#undef __CONCAT
#define __CONCAT1(x, y) x##y