Remove mostly-unused winclude.h

nmap · May 29, 2019 · 7742196 · 7742196
1 parent 8cae7b4
commit 7742196
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 170 deletions.
diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc
@@ -137,9 +137,7 @@
 
 #include "nbase.h"
 
-#ifdef WIN32
-#include "mswin32/winclude.h"
-#else
+#ifndef WIN32
 #include <sys/uio.h>
 #include <sys/ioctl.h>
 #endif
@@ -173,6 +171,11 @@
 # endif
 #endif /* Solaris */
 
+#ifdef WIN32
+typedef unsigned __int32 u_int32_t;
+typedef unsigned __int16 u_int16_t;
+typedef unsigned __int8 u_int8_t;
+#endif
 
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/mswin32/nmap.vcxproj b/mswin32/nmap.vcxproj
@@ -244,7 +244,6 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje
  <ClInclude Include="..\traceroute.h" />
  <ClInclude Include="..\utils.h" />
  <ClInclude Include="..\xml.h" />
- <ClInclude Include="winclude.h" />
  <ClInclude Include="winfix.h" />
  </ItemGroup>
  <ItemGroup>
@@ -363,4 +362,4 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
diff --git a/mswin32/winclude.h b/mswin32/winclude.h
diff --git a/mswin32/winfix.cc b/mswin32/winfix.cc
@@ -131,17 +131,16 @@
 
 /* $Id: */
 
-#include <winclude.h>
-#include <shellapi.h>
-
-
+#include <nmap_winconfig.h>
 #include "..\nmap.h"
 #include "..\tcpip.h"
 #include "winfix.h"
 #include "..\NmapOps.h"
 #include "..\nmap_error.h"
 #include <Packet32.h>
 
+#include <shellapi.h>
+
 #ifdef _MSC_VER
 # include <delayimp.h>
 #endif

diff --git a/nmap.h b/nmap.h
@@ -136,10 +136,6 @@
 
 /************************INCLUDES**********************************/
 
-#ifdef WIN32
-#include "mswin32\winclude.h"
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "nmap_config.h"
 #else

diff --git a/nmap_error.h b/nmap_error.h
@@ -132,10 +132,6 @@
 #ifndef NMAP_ERROR_H
 #define NMAP_ERROR_H
 
-#ifdef WIN32
-#include "mswin32\winclude.h"
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "nmap_config.h"
 #else

diff --git a/services.h b/services.h
@@ -134,9 +134,7 @@
 #ifndef SERVICES_H
 #define SERVICES_H
 
-#ifdef WIN32
-#include "mswin32\winclude.h"
-#else
+#ifndef WIN32
 #include <netdb.h>
 #endif
 

diff --git a/struct_ip.h b/struct_ip.h
@@ -17,6 +17,11 @@ struct ip {
  file, so it can be included in a .cc file after other .h have been
  included. */
 
+#ifdef WIN32
+typedef unsigned __int32 u_int32_t;
+typedef unsigned __int16 u_int16_t;
+typedef unsigned __int8 u_int8_t;
+#endif
 /* Linux uses these defines in netinet/ip.h to use the correct struct ip */
 #ifndef __FAVOR_BSD
 #define __FAVOR_BSD