diff options
| author |   bluhm <bluhm@openbsd.org> | 2020-11-06 15:26:38 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2020-11-06 15:26:38 +0000 |
| commit | 4fd0c110d58ef4157fca1bcf1e12cff0a80ddbe1 (patch) | |
| tree | 373e2830efdf92406862971f8f1e5e63c392fc7d | |
| parent | Clean up arm64's autoconf code. There have been quite a few unused (diff) | |
| download | wireguard-openbsd-4fd0c110d58ef4157fca1bcf1e12cff0a80ddbe1.tar.xz wireguard-openbsd-4fd0c110d58ef4157fca1bcf1e12cff0a80ddbe1.zip | |
Compiling rtable.c kernel source file needs satosin() and satosin6()
now. Provide macros via CPPFLAGS on command line.
| -rw-r--r-- | regress/sys/net/rtable/Makefile.inc | 6 | ||||
| -rw-r--r-- | regress/sys/net/rtable/util.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/regress/sys/net/rtable/Makefile.inc b/regress/sys/net/rtable/Makefile.inc index a3ab4b49b7b..df2cbca2d27 100644 --- a/regress/sys/net/rtable/Makefile.inc +++ b/regress/sys/net/rtable/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2019/06/24 12:36:15 visa Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2020/11/06 15:26:38 bluhm Exp $ TOPDIR= ${.CURDIR}/.. @@ -9,6 +9,8 @@ SRCS+= art.c CFLAGS+= -DART .endif -CPPFLAGS+= -I${TOPDIR} -Wall +CPPFLAGS+= -I${TOPDIR} -Wall \ + -D'satosin(sa)=((struct sockaddr_in *)(sa))' \ + -D'satosin6(sa)=((struct sockaddr_in6 *)(sa))' .PATH: ${TOPDIR} ${TOPDIR}/../../../../sys/net diff --git a/regress/sys/net/rtable/util.h b/regress/sys/net/rtable/util.h index dedcb893b0e..0c234b611be 100644 --- a/regress/sys/net/rtable/util.h +++ b/regress/sys/net/rtable/util.h @@ -1,4 +1,4 @@ -/* $OpenBSD: util.h,v 1.2 2017/07/27 13:34:30 mpi Exp $ */ +/* $OpenBSD: util.h,v 1.3 2020/11/06 15:26:38 bluhm Exp $ */ /* * Copyright (c) 2015 Martin Pieuchot @@ -30,6 +30,3 @@ int maskcmp(sa_family_t, struct sockaddr *, struct sockaddr *); int inet_net_ptosa(sa_family_t, const char *, struct sockaddr *, struct sockaddr *); char *inet_net_satop(sa_family_t, struct sockaddr *, int, char *, size_t); - -#define satosin(sa) ((struct sockaddr_in *)(sa)) -#define satosin6(sa) ((struct sockaddr_in6 *)(sa)) |