summaryrefslogtreecommitdiff
path: root/src/common.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/common.h')
-rw-r--r--src/common.h25
1 files changed, 19 insertions, 6 deletions
diff --git a/src/common.h b/src/common.h
index 358db77..32b36cd 100644
--- a/src/common.h
+++ b/src/common.h
@@ -29,15 +29,28 @@
#if (_WIN32) || (__CYGWIN__)
-/* MSVC warns about snprintf */
-#define _CRT_SECURE_NO_WARNINGS
+ /* MSVC warns about snprintf */
+ #define _CRT_SECURE_NO_WARNINGS
+ /* don't pull in pcap/bpf.h */
+ #define PCAP_DONT_INCLUDE_PCAP_BPF_H
+ #include <pcap/pcap.h>
+
+ /* don't pull in Packet32's locol bpf definitions */
+ // #define BPF_MAJOR_VERSION
+ #include <Packet32.h>
+ #include <malloc.h> /* alloca() */
+
+#ifdef __MINGW32__
+ #include <ntddndis.h>
#else
+ #include <Ntddndis.h>
+#endif
-#include <assert.h>
+#else
+#include <assert.h>
#include <sys/types.h>
-
#include <netinet/in.h>
/* TODO - should ../include/gnuc.h be included here? */
@@ -46,7 +59,7 @@
#endif
-#include "../include/config.h"
+#include <config.h>
#include "../include/libnet.h"
/* IPPROTO_ and sockaddr_ definitions are here. They are often
@@ -55,4 +68,4 @@
*/
#ifndef IPPROTO_MH
#define IPPROTO_MH 135 /* IPv6 mobility header */
-#endif
+#endif \ No newline at end of file