CVS commit: src/external/bsd/ipf/dist/ipsend
Module Name:src Committed By: christos Date: Sun Apr 29 15:59:07 UTC 2018 Modified Files: src/external/bsd/ipf/dist/ipsend: ipsend.h Log Message: fix the build: tcpiphdr is now defined in tcp_var.h and tcp_var.h needs tcp_timer.h. This struct move is more trouble than its worth. It breaks header compatibility with other BSD's and can't be really removed because it is an installed header that will break other 3rd party software. I suggest that it gets reverted! To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/ipf/dist/ipsend/ipsend.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ipf/dist/ipsend/ipsend.h diff -u src/external/bsd/ipf/dist/ipsend/ipsend.h:1.1.1.2 src/external/bsd/ipf/dist/ipsend/ipsend.h:1.2 --- src/external/bsd/ipf/dist/ipsend/ipsend.h:1.1.1.2 Sun Jul 22 09:44:36 2012 +++ src/external/bsd/ipf/dist/ipsend/ipsend.h Sun Apr 29 11:59:07 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ipsend.h,v 1.1.1.2 2012/07/22 13:44:36 darrenr Exp $ */ +/* $NetBSD: ipsend.h,v 1.2 2018/04/29 15:59:07 christos Exp $ */ /* * ipsend.h (C) 1997-1998 Darren Reed @@ -29,7 +29,9 @@ #ifdef linux #include #endif -#include "netinet/tcpip.h" +#include +#include +#include #include "ipt.h" extern int resolve __P((char *, char *));
CVS commit: src/external/bsd/ipf/dist/ipsend
Module Name:src Committed By: kamil Date: Thu Jun 15 23:55:42 UTC 2017 Modified Files: src/external/bsd/ipf/dist/ipsend: lsock.c Log Message: Don't include on NetBSD in IPF (lsock) This header in this context is freebsdism. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/dist/ipsend/lsock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ipf/dist/ipsend/lsock.c diff -u src/external/bsd/ipf/dist/ipsend/lsock.c:1.2 src/external/bsd/ipf/dist/ipsend/lsock.c:1.3 --- src/external/bsd/ipf/dist/ipsend/lsock.c:1.2 Sun Jul 22 14:27:36 2012 +++ src/external/bsd/ipf/dist/ipsend/lsock.c Thu Jun 15 23:55:42 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: lsock.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */ +/* $NetBSD: lsock.c,v 1.3 2017/06/15 23:55:42 kamil Exp $ */ /* * lsock.c (C) 1995-1998 Darren Reed @@ -39,7 +39,9 @@ static const char rcsid[] = "@(#)Id: lso #include #include #include +#if defined(__FreeBSD__) #include +#endif #include #include #include
CVS commit: src/external/bsd/ipf/dist/ipsend
Module Name:src Committed By: kamil Date: Thu Jun 15 23:53:56 UTC 2017 Modified Files: src/external/bsd/ipf/dist/ipsend: iptests.c Log Message: Don't include on NetBSD in IPF (iptests) This header in this context is freebsdism. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/ipsend/iptests.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ipf/dist/ipsend/iptests.c diff -u src/external/bsd/ipf/dist/ipsend/iptests.c:1.3 src/external/bsd/ipf/dist/ipsend/iptests.c:1.4 --- src/external/bsd/ipf/dist/ipsend/iptests.c:1.3 Sun Jul 22 14:27:36 2012 +++ src/external/bsd/ipf/dist/ipsend/iptests.c Thu Jun 15 23:53:56 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: iptests.c,v 1.3 2012/07/22 14:27:36 darrenr Exp $ */ +/* $NetBSD: iptests.c,v 1.4 2017/06/15 23:53:56 kamil Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -41,7 +41,9 @@ typedef int boolean_t; #endif #if !defined(solaris) && !defined(linux) && !defined(__sgi) # include +#if defined(__FreeBSD__) # include +#endif # include #endif #if !defined(ultrix) && !defined(hpux) && !defined(linux) && \
CVS commit: src/external/bsd/ipf/dist/ipsend
Module Name:src Committed By: kamil Date: Thu Jun 15 23:50:20 UTC 2017 Modified Files: src/external/bsd/ipf/dist/ipsend: sock.c Log Message: Don't include on NetBSD in IPF This header in this context is freebsdism. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/ipsend/sock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ipf/dist/ipsend/sock.c diff -u src/external/bsd/ipf/dist/ipsend/sock.c:1.3 src/external/bsd/ipf/dist/ipsend/sock.c:1.4 --- src/external/bsd/ipf/dist/ipsend/sock.c:1.3 Sun Jul 22 14:27:36 2012 +++ src/external/bsd/ipf/dist/ipsend/sock.c Thu Jun 15 23:50:20 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: sock.c,v 1.3 2012/07/22 14:27:36 darrenr Exp $ */ +/* $NetBSD: sock.c,v 1.4 2017/06/15 23:50:20 kamil Exp $ */ /* * sock.c (C) 1995-1998 Darren Reed @@ -47,7 +47,9 @@ typedef int boolean_t; # undef KERNEL #endif #include +#if defined(__FreeBSD__) #include +#endif #include #include #include