svn commit: r366699 - in head: kerberos5/include tools/build tools/build/cross-build/include/common/sys

[Alex Richardson]

Author: arichardson
Date: Wed Oct 14 12:28:54 2020
New Revision: 366699
URL: https://svnweb.freebsd.org/changeset/base/366699

Log:
  Fix more -Wundef warnings during bootstrap

Modified:
  head/kerberos5/include/config.h
  head/tools/build/Makefile
  head/tools/build/cross-build/include/common/sys/cdefs.h

Modified: head/kerberos5/include/config.h
==============================================================================
--- head/kerberos5/include/config.h	Wed Oct 14 12:28:48 2020	(r366698)
+++ head/kerberos5/include/config.h	Wed Oct 14 12:28:54 2020	(r366699)
@@ -975,7 +975,7 @@ static /**/const char *const rcsid[] = { (const char *
 #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

Modified: head/tools/build/Makefile
==============================================================================
--- head/tools/build/Makefile	Wed Oct 14 12:28:48 2020	(r366698)
+++ head/tools/build/Makefile	Wed Oct 14 12:28:54 2020	(r366699)
@@ -57,8 +57,8 @@ _WITH_STRSVIS!=	grep -c strsvis ${HOST_INCLUDE_ROOT}/v
 .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

Modified: head/tools/build/cross-build/include/common/sys/cdefs.h
==============================================================================
--- head/tools/build/cross-build/include/common/sys/cdefs.h	Wed Oct 14 12:28:48 2020	(r366698)
+++ head/tools/build/cross-build/include/common/sys/cdefs.h	Wed Oct 14 12:28:54 2020	(r366699)
@@ -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