mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

- Fix build with amd64

Browse Source 
PR:		107478
Submitted by:	Daniel Roethlisberger <daniel@roe.ch> (maintainer)
This commit is contained in:
Martin Wilke 2007-01-03 17:17:43 +00:00
parent 453b480975
commit e19f7771e5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=181354
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
security/nmap/files/patch-output.cc
View File

@ -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 */

19
security/nmap/files/patch-tcpip.cc
View File

@ -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());