From e4a6ea70b632297acd339b7762d6cec13887a130 Mon Sep 17 00:00:00 2001
From: perdo <perdo@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sat, 21 Jul 2012 13:08:34 +0000
Subject: [PATCH] Applied a patch provided by jah that solves a problem with
 includes on windows.

---
 nse_fs.cc | 40 +++++++++++++---------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/nse_fs.cc b/nse_fs.cc
index c091dc8d1..f452b7a19 100644
--- a/nse_fs.cc
+++ b/nse_fs.cc
@@ -36,32 +36,6 @@
 
 #define _LARGEFILE64_SOURCE
 
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/stat.h>
-
-#ifdef _WIN32
-#include <direct.h>
-#include <windows.h>
-#include <io.h>
-#include <sys/locking.h>
-#ifdef __BORLANDC__
- #include <utime.h>
-#else
- #include <sys/utime.h>
-#endif
-#include <fcntl.h>
-#else
-#include <unistd.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <utime.h>
-#endif
-
 extern "C" {
   #include "lauxlib.h"
   #include "lua.h"
@@ -73,8 +47,21 @@ extern "C" {
 #include "nmap_error.h"
 #include "NmapOps.h"
 
+#ifdef _WIN32
+#include <direct.h>
+#include <sys/utime.h>
+#else
+#include <dirent.h>
+#include <utime.h>
+#endif
+
+#include <errno.h>
+#include <string.h>
+
 #include <string>
 
+#define DIR_METATABLE "directory metatable"
+
 #ifndef MAX_PATH
 #define MAX_PATH 2048
 #endif
@@ -93,7 +80,6 @@ extern "C" {
 #define strerror(_)  "System unable to describe the error"
 #endif
 
-#define DIR_METATABLE "directory metatable"
 typedef struct dir_data {
   int  closed;
 #ifdef _WIN32