Hi,
while running regression tests on an octeon ERL, I noticed that
no-macro-redefined flag was not known to the compiler.
I added some #undefs and some hours ago a change to art_walk made
the tests fail too.
The no-macro-redefine was added 3 month ago.
Thanks,
mbuhl
Index: regress/sys/net/rtable/Makefile.inc
===================================================================
RCS file: /mount/openbsd/cvs/src/regress/sys/net/rtable/Makefile.inc,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.inc
--- regress/sys/net/rtable/Makefile.inc 31 Mar 2019 14:03:40 -0000 1.4
+++ regress/sys/net/rtable/Makefile.inc 21 Jun 2019 18:26:06 -0000
@@ -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
Index: regress/sys/net/rtable/srp_compat.h
===================================================================
RCS file: /mount/openbsd/cvs/src/regress/sys/net/rtable/srp_compat.h,v
retrieving revision 1.5
diff -u -p -r1.5 srp_compat.h
--- regress/sys/net/rtable/srp_compat.h 27 Jul 2017 13:34:30 -0000 1.5
+++ regress/sys/net/rtable/srp_compat.h 21 Jun 2019 14:38:33 -0000
@@ -48,7 +48,9 @@ srp_swap_locked(struct srp *srp, void *n
*/
#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);
Index: regress/sys/net/rtable/delete/main.c
===================================================================
RCS file: /mount/openbsd/cvs/src/regress/sys/net/rtable/delete/main.c,v
retrieving revision 1.5
diff -u -p -r1.5 main.c
--- regress/sys/net/rtable/delete/main.c 15 Nov 2016 10:43:41 -0000
1.5
+++ regress/sys/net/rtable/delete/main.c 21 Jun 2019 18:20:20 -0000
@@ -58,9 +58,9 @@ main(int argc, char *argv[])
do_from_file(0, AF_INET6, filename, route_insert);
- rtable_walk(0, AF_INET6, rtentry_delete, NULL);
+ rtable_walk(0, AF_INET6, NULL, rtentry_delete, NULL);
- rtable_walk(0, AF_INET6, rtentry_dump, NULL);
+ rtable_walk(0, AF_INET6, NULL, rtentry_dump, NULL);
#ifdef ART
struct art_root *ar;
Index: regress/sys/net/rtable/fullfeed/main.c
===================================================================
RCS file: /mount/openbsd/cvs/src/regress/sys/net/rtable/fullfeed/main.c,v
retrieving revision 1.3
diff -u -p -r1.3 main.c
--- regress/sys/net/rtable/fullfeed/main.c 15 Nov 2016 10:43:41 -0000
1.3
+++ regress/sys/net/rtable/fullfeed/main.c 21 Jun 2019 18:20:38 -0000
@@ -53,7 +53,7 @@ main(int argc, char *argv[])
do_from_file(0, af, filename, route_insert);
do_from_file(0, af, filename, route_lookup);
- rtable_walk(0, af, rtentry_dump, NULL);
+ rtable_walk(0, af, NULL, rtentry_dump, NULL);
do_from_file(0, af, filename, route_delete);
