diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2017-12-27 10:39:58 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2017-12-27 10:39:58 +0000 |
| commit | f1405f0ddcdcd49d2a3c6c637c7c2b41e5200650 (patch) | |
| tree | 93205236924b20f195ea25cd6e094497e70f1d78 /sysutils/pflogx/files/patch-include_LogParser.h | |
| parent | Deprecate ports broken for more than 6 months (diff) | |
Unbreak the build on sparc64: it was caused by #include <net/pfvar.h> that
was conflicting with C++ headers, leading to the following errors:
In file included from /usr/include/c++/4.2/iostream:45,
from ../include/XmlFileWriter.h:36,
from pflogx.cpp:36:
/usr/include/c++/4.2/ostream:566:47: error: macro "flush" passed 2
arguments, but takes just 1
This header was required before PF_* enums were moved to <netpfil/pf/pf.h>,
which applies to all supported versions of FreeBSD. Thus, do not #include
offending and nowadays useless header file, only #include <netpfil/pf/pf.h>
(which is #included by <net/pfvar.h>) when its definitions are needed.
Tested on: i386, amd64, powerpc, sparc64
Notes
Notes:
svn path=/head/; revision=457359
Diffstat (limited to 'sysutils/pflogx/files/patch-include_LogParser.h')
| -rw-r--r-- | sysutils/pflogx/files/patch-include_LogParser.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sysutils/pflogx/files/patch-include_LogParser.h b/sysutils/pflogx/files/patch-include_LogParser.h new file mode 100644 index 000000000000..b51c1d9e345b --- /dev/null +++ b/sysutils/pflogx/files/patch-include_LogParser.h @@ -0,0 +1,10 @@ +--- include/LogParser.h.orig 2006-04-16 13:45:17 UTC ++++ include/LogParser.h +@@ -35,7 +35,6 @@ + #include <sys/socket.h> + #include <net/if.h> + #include <netinet/in.h> +-#include <net/pfvar.h> + #include <net/if_pflog.h> + #include <netinet/in_systm.h> + #include <netinet/ip.h> |