Update config.{guess,sub}, timestamps 2023-01-01,2023-01-21

[libpcap] / pcap-int.h

diff --git a/pcap-int.h b/pcap-int.h
index 4302ac3688e7f988c154fe85930d2ce7b47d44ff..894e74afa85305b1db1524ff251670aba9a71b50 100644 (file)
--- 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.
@@ -385,7 +407,7 @@ struct pcap_timeval {
  *
  * Then supply the changes by forking the branch at
  *
- *     https://github.com/the-tcpdump-group/libpcap/issues
+ *     https://github.com/the-tcpdump-group/libpcap/tree/master
  *
  * and issuing a pull request, so that future versions of libpcap and
  * programs that use it (such as tcpdump) will be able to read your new
@@ -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.
  */
@@ -483,16 +501,6 @@ void       pcap_cleanup_live_common(pcap_t *);
 int    pcap_check_activated(pcap_t *);
 void   pcap_breakloop_common(pcap_t *);
 
-#ifdef _WIN32
-/*
- * XXX - TEMPORARY TO FIGURE OUT WHY WE'RE NOT GETTING WARNINGS ABOUT
- * ASSIGNMENT OF A POINTER TO CONST CHAR VALUE TO A POINTER TO CHAR
- * VARIABLE.
- */
-LPCSTR PacketGetLPCSTR(void);
-const char *PacketGetConstCharStar(void);
-#endif
-
 /*
  * Internal interfaces for "pcap_findalldevs()".
  *
@@ -561,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.
  */
@@ -602,7 +610,7 @@ pcap_funcptr_t              pcap_find_function(pcap_code_handle_t, const char *);
  * Linux kernel when the kernel rejects the filter (requiring us to
  * run it in userland).  It contains VLAN tag information.
  */
-struct bpf_aux_data {
+struct pcap_bpf_aux_data {
        u_short vlan_tag_present;
        u_short vlan_tag;
 };
@@ -612,7 +620,7 @@ struct bpf_aux_data {
  * argument.
  */
 u_int  pcap_filter_with_aux_data(const struct bpf_insn *,
-    const u_char *, u_int, u_int, const struct bpf_aux_data *);
+    const u_char *, u_int, u_int, const struct pcap_bpf_aux_data *);
 
 /*
  * Filtering routine that doesn't.