diff options
| author |   visa <visa@openbsd.org> | 2019-06-24 12:36:15 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2019-06-24 12:36:15 +0000 |
| commit | 61306f302519b1c42dba32a24fb012876e246cf9 (patch) | |
| tree | af8b172dfbffc24a0112150fcac26dd8ebb01ba3 | |
| parent | Fix test after kernel interface change. (diff) | |
| download | wireguard-openbsd-61306f302519b1c42dba32a24fb012876e246cf9.tar.xz wireguard-openbsd-61306f302519b1c42dba32a24fb012876e246cf9.zip | |
Do not use a warning flag that base gcc does not understand,
and fix the warnings.
From Moritz Buhl
| -rw-r--r-- | regress/sys/net/rtable/Makefile.inc | 4 | ||||
| -rw-r--r-- | regress/sys/net/rtable/srp_compat.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/regress/sys/net/rtable/Makefile.inc b/regress/sys/net/rtable/Makefile.inc index cfd952b1acf..a3ab4b49b7b 100644 --- a/regress/sys/net/rtable/Makefile.inc +++ b/regress/sys/net/rtable/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.4 2019/03/31 14:03:40 mpi Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2019/06/24 12:36:15 visa Exp $ TOPDIR= ${.CURDIR}/.. @@ -9,6 +9,6 @@ SRCS+= art.c CFLAGS+= -DART .endif -CPPFLAGS+= -I${TOPDIR} -Wall -Wno-macro-redefined +CPPFLAGS+= -I${TOPDIR} -Wall .PATH: ${TOPDIR} ${TOPDIR}/../../../../sys/net diff --git a/regress/sys/net/rtable/srp_compat.h b/regress/sys/net/rtable/srp_compat.h index 3059ac0de03..68de566b326 100644 --- a/regress/sys/net/rtable/srp_compat.h +++ b/regress/sys/net/rtable/srp_compat.h @@ -48,7 +48,9 @@ srp_swap_locked(struct srp *srp, void *nv) */ #define SRPL_INIT(_sl) SLIST_INIT(_sl) +#undef SRPL_HEAD #define SRPL_HEAD(name, entry) SLIST_HEAD(name, entry) +#undef SRPL_ENTRY #define SRPL_ENTRY(type) SLIST_ENTRY(type) #define SRPL_FIRST(_sr, _sl) SLIST_FIRST(_sl); |