Fix more -Wundef warnings during bootstrap

This commit is contained in:
Alex Richardson 2020-10-14 12:28:54 +00:00
parent a31993fece
commit a525283161
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=366699
3 changed files with 3 additions and 8 deletions

View File

@ -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

View File

@ -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

View File

@ -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