From 17b7ec4622719e9da58424eaf2cbc3c806da701a Mon Sep 17 00:00:00 2001
From: kris <kris@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Mon, 12 Jul 2010 22:12:09 +0000
Subject: [PATCH] Now this should fix the last commit, but for Windows (and
 whatever else sucks and doesn't use normal socket headers).  Untested now,
 but everything should be guarded like elsewhere.  I forget this stuff until
 after I type ci...

---
 libnetutil/netutil.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc
index 0f2449dcb..f633e5e47 100644
--- a/libnetutil/netutil.cc
+++ b/libnetutil/netutil.cc
@@ -91,6 +91,8 @@
 #include "../nmap_config.h"
 #endif
 
+#include "nbase.h"
+
 #ifdef WIN32
 #include "mswin32/winclude.h"
 #include "pcap-int.h"
@@ -101,10 +103,14 @@
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
 #include <net/if_arp.h>
 
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 
 #ifndef NETINET_IN_SYSTEM_H  /* why the HELL does OpenBSD not do this? */
 #include <netinet/in_systm.h>
@@ -122,7 +128,6 @@
 #define NETINET_IP_H
 #endif
 
-#include "nbase.h"
 #include "netutil.h"
 
 #define NBASE_MAX_ERR_STR_LEN 1024  /* Max length of an error message */