diff options
| author | miwi <miwi@FreeBSD.org> | 2007-01-04 01:17:43 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2007-01-04 01:17:43 +0800 |
| commit | dbbde9798476e37e659a348030d8840142337b98 (patch) | |
| tree | dba2f1aa5124e66f12aa810f723414399f08a7d8 | |
| parent | 056790f834a5c4be5376260c67de3523696e1d57 (diff) | |
| download | freebsd-ports-gnome-dbbde9798476e37e659a348030d8840142337b98.tar.gz freebsd-ports-gnome-dbbde9798476e37e659a348030d8840142337b98.tar.zst freebsd-ports-gnome-dbbde9798476e37e659a348030d8840142337b98.zip | |
- Fix build with amd64
PR: 107478
Submitted by: Daniel Roethlisberger <daniel@roe.ch> (maintainer)
| -rw-r--r-- | security/nmap/files/patch-output.cc | 14 | ||||
| -rw-r--r-- | security/nmap/files/patch-tcpip.cc | 19 |
2 files changed, 25 insertions, 8 deletions
diff --git a/security/nmap/files/patch-output.cc b/security/nmap/files/patch-output.cc index 7a1d364dfcb9..f5cc0d91606a 100644 --- a/security/nmap/files/patch-output.cc +++ b/security/nmap/files/patch-output.cc @@ -1,12 +1,20 @@ --- output.cc.orig Fri Dec 8 04:01:19 2006 -+++ output.cc Mon Dec 18 15:50:13 2006 -@@ -742,8 +742,8 @@ ++++ output.cc Wed Jan 3 17:10:43 2007 +@@ -109,6 +109,7 @@ + #include "NmapOutputTable.h" + #include "MACLookup.h" + ++#include <sys/param.h> + #include <string> + + /* Workaround for lack of namespace std on HP-UX 11.00 */ +@@ -742,8 +743,8 @@ case LOG_MACHINE: case LOG_SKID: case LOG_XML: -#ifdef WIN32 - apcopy = ap; -+#if defined(WIN32) || (defined(FREEBSD) && (OSVERSION < 500000)) ++#if defined(WIN32) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) + apcopy = ap; #else va_copy(apcopy, ap); /* Needed in case we need to so a second vnsprintf */ diff --git a/security/nmap/files/patch-tcpip.cc b/security/nmap/files/patch-tcpip.cc index d4233a62e90a..cd67b771bc2b 100644 --- a/security/nmap/files/patch-tcpip.cc +++ b/security/nmap/files/patch-tcpip.cc @@ -1,20 +1,29 @@ --- tcpip.cc.orig Fri Dec 8 04:01:19 2006 -+++ tcpip.cc Mon Dec 18 15:48:46 2006 -@@ -1959,7 +1959,7 @@ ++++ tcpip.cc Wed Jan 3 17:15:05 2007 +@@ -133,6 +133,8 @@ + #endif /* NETINET_IF_ETHER_H */ + #endif /* HAVE_NETINET_IF_ETHER_H */ + ++#include <sys/param.h> ++ + extern NmapOps o; + + #ifdef WIN32 +@@ -1959,7 +1961,7 @@ // Returns whether the system supports pcap_get_selectable_fd() properly bool pcap_selectable_fd_valid() { -#if defined(WIN32) || defined(MACOSX) -+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (OSVERSION < 500000)) ++#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) return false; #endif return true; -@@ -1972,7 +1972,7 @@ +@@ -1972,7 +1974,7 @@ results. If you just want to test whether the function is supported, use pcap_selectable_fd_valid() instead. */ int my_pcap_get_selectable_fd(pcap_t *p) { -#if defined(WIN32) || defined(MACOSX) -+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (OSVERSION < 500000)) ++#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) return -1; #else assert(pcap_selectable_fd_valid()); |