Fixed the bug that wpcap.dll causes Wireshark crash on Win8 and Win10.

yaoyeyi · Feb 4, 2016 · 41f34f9 · 41f34f9
1 parent 2fbf96c
commit 41f34f9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/wpcap/PRJ/wpcap.sln b/wpcap/PRJ/wpcap.sln
@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wpcap", "wpcap.vcxproj", "{20B438DA-CBEC-4AFF-B11C-67B301D14AD5}"
 EndProject
 Global

diff --git a/wpcap/libpcap/pcap-stdinc.h b/wpcap/libpcap/pcap-stdinc.h
@@ -60,11 +60,12 @@
 
 #define caddr_t char*
 
-#if _MSC_VER < 1500
+// These definitions should have no limitation for Visual Studio versions, otherwise Wireshark will crash.
+/*#if _MSC_VER < 1500*/
 #define snprintf _snprintf
 #define vsnprintf _vsnprintf
 #define strdup _strdup
-#endif
+/*#endif*/
 
 #define inline __inline