PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-12 02:39:03 +00:00
Code Issues Projects Releases Wiki Activity

Include <net/if.h> before <net/if_arp.h>.

Browse Source 
This may fix some build problems on AIX 5.3.
This commit is contained in:
david
2012-03-07 03:39:11 +00:00
parent 1bcc757d28
commit 941d609eef
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libnetutil/netutil.cc
View File

@@ -116,6 +116,17 @@
#if HAVE_SYS_SOCKIO_H #if HAVE_SYS_SOCKIO_H
#include <sys/sockio.h> /* SIOCGIFCONF for Solaris */ #include <sys/sockio.h> /* SIOCGIFCONF for Solaris */
#endif #endif
#if HAVE_NET_IF_H
#ifndef NET_IF_H /* This guarding is needed for at least some versions of OpenBSD */
#include <net/if.h>
#define NET_IF_H
#endif
#endif
#ifndef NETINET_IP_H /* This guarding is needed for at least some versions of OpenBSD */
#include <netinet/ip.h>
#define NETINET_IP_H
#endif
#include <net/if_arp.h> #include <net/if_arp.h>
/* Define CMSG_* symbols for Solaris 9 and earlier. See /* Define CMSG_* symbols for Solaris 9 and earlier. See
@@ -152,17 +163,6 @@
#include "netutil.h" #include "netutil.h"
#if HAVE_NET_IF_H
#ifndef NET_IF_H /* This guarding is needed for at least some versions of OpenBSD */
#include <net/if.h>
#define NET_IF_H
#endif
#endif
#ifndef NETINET_IP_H /* This guarding is needed for at least some versions of OpenBSD */
#include <netinet/ip.h>
#define NETINET_IP_H
#endif
#if HAVE_SYS_RESOURCE_H #if HAVE_SYS_RESOURCE_H
#include <sys/resource.h> #include <sys/resource.h>
#endif #endif

13
tcpip.cc
View File

@@ -100,7 +100,6 @@
#include "nbase.h" #include "nbase.h"
#include "portreasons.h" #include "portreasons.h"
#include <dnet.h> #include <dnet.h>
#include <net/if_arp.h>
#include "tcpip.h" #include "tcpip.h"
#include "NmapOps.h" #include "NmapOps.h"
#include "Target.h" #include "Target.h"
@@ -117,6 +116,18 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#if HAVE_NET_IF_H
#ifndef NET_IF_H /* This guarding is needed for at least some versions of OpenBSD */
#include <net/if.h>
#define NET_IF_H
#endif
#endif
#ifndef NETINET_IP_H /* This guarding is needed for at least some versions of OpenBSD */
#include <netinet/ip.h>
#define NETINET_IP_H
#endif
#include <net/if_arp.h>
#if HAVE_NETINET_IF_ETHER_H #if HAVE_NETINET_IF_ETHER_H
#ifndef NETINET_IF_ETHER_H #ifndef NETINET_IF_ETHER_H
#include <netinet/if_ether.h> #include <netinet/if_ether.h>