X-Git-Url: https://git.tcpdump.org/libpcap/blobdiff_plain/71c863d2aa87e2a844ec3ffbf3b232fc80f44b3e..09b51d326c38ea8e10ce4da09c09d50e08c5aeb8:/pcap-int.h?ds=sidebyside

diff --git a/pcap-int.h b/pcap-int.h
index febac031..894e74af 100644
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -40,9 +40,36 @@
 
 #include <pcap/pcap.h>
 
+#ifdef MSDOS
+  #include <fcntl.h>
+  #include <io.h>
+#endif
+
 #include "varattrs.h"
 #include "fmtutils.h"
 
+#include <stdarg.h>
+
+#include "portability.h"
+
+/*
+ * If we're compiling with Visual Studio, make sure we have at least
+ * VS 2015 or later, so we have sufficient C99 support.
+ *
+ * XXX - verify that we have at least C99 support on UN*Xes?
+ *
+ * What about MinGW or various DOS toolchains?  We're currently assuming
+ * sufficient C99 support there.
+ */
+#if defined(_MSC_VER)
+  /*
+   * Compiler is MSVC.  Make sure we have VS 2015 or later.
+   */
+  #if _MSC_VER < 1900
+    #error "Building libpcap requires VS 2015 or later"
+  #endif
+#endif
+
 /*
  * Version string.
  * Uses PACKAGE_VERSION from config.h.
@@ -80,11 +107,6 @@ extern int pcap_new_api;
  */
 extern int pcap_utf_8_mode;
 
-#ifdef MSDOS
-  #include <fcntl.h>
-  #include <io.h>
-#endif
-
 /*
  * Swap byte ordering of unsigned long long timestamp on a big endian
  * machine.
@@ -433,10 +455,6 @@ struct oneshot_userdata {
 
 int	pcap_offline_read(pcap_t *, int, pcap_handler, u_char *);
 
-#include <stdarg.h>
-
-#include "portability.h"
-
 /*
  * Does the packet count argument to a module's read routine say
  * "supply packets until you run out of packets"?
@@ -467,7 +485,7 @@ pcap_t	*pcap_create_interface(const char *, char *);
 /*
  * This wrapper takes an error buffer pointer and a type to use for the
  * private data, and calls pcap_create_common(), passing it the error
- * buffer pointer, the size fo the private data type, in bytes, and the
+ * buffer pointer, the size for the private data type, in bytes, and the
  * offset of the private data from the beginning of the structure, in
  * bytes.
  */
@@ -551,7 +569,7 @@ int	add_addr_to_if(pcap_if_list_t *, const char *, bpf_u_int32,
 /*
  * This wrapper takes an error buffer pointer and a type to use for the
  * private data, and calls pcap_create_common(), passing it the error
- * buffer pointer, the size fo the private data type, in bytes, and the
+ * buffer pointer, the size for the private data type, in bytes, and the
  * offset of the private data from the beginning of the structure, in
  * bytes.
  */