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

Revert "Include <net/if.h> before <net/if_arp.h>" in netutil.cc.

Browse Source 
This seems be broken on AIX 5.3.
This commit is contained in:
david
2012-03-12 23:00:04 +00:00
parent 523dbc609a
commit 2a71786fb9
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libnetutil/netutil.cc
View File

@@ -116,17 +116,6 @@
#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
@@ -163,6 +152,17 @@
#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