summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-01-10 12:24:05 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-01-10 12:24:05 +0100
commit60d8d08c522cb70355c6b062fff721c54f35f595 (patch)
treefe7736c5660847820a8423e7ed00613f429c22fc /3rdparty
parentc4fa7719b1d79734d15da03ade1068c83dc6f8bf (diff)
Compile fixes (nw)
Diffstat (limited to '3rdparty')
-rw-r--r--3rdparty/winpcap/Include/bittypes.h4
-rw-r--r--3rdparty/winpcap/Include/pcap-stdinc.h4
2 files changed, 5 insertions, 3 deletions
diff --git a/3rdparty/winpcap/Include/bittypes.h b/3rdparty/winpcap/Include/bittypes.h
index 558a0b5c0d8..c9d3b177c09 100644
--- a/3rdparty/winpcap/Include/bittypes.h
+++ b/3rdparty/winpcap/Include/bittypes.h
@@ -69,7 +69,7 @@ typedef signed char int16_t;
#if SIZEOF_INT == 4
typedef unsigned int u_int32_t;
typedef signed int int32_t;
-#elif SIZEOF_LONG == 4
+#elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 4)
typedef unsigned long u_int32_t;
typedef signed long int32_t;
#elif SIZEOF_SHORT == 4
@@ -92,7 +92,7 @@ typedef unsigned _int64 u_int64_t;
typedef _int64 int64_t;
#elif SIZEOF_INT == 8
typedef unsigned int u_int64_t;
-#elif SIZEOF_LONG == 8
+#elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 8)
typedef unsigned long u_int64_t;
#elif SIZEOF_SHORT == 8
typedef unsigned short u_int64_t;
diff --git a/3rdparty/winpcap/Include/pcap-stdinc.h b/3rdparty/winpcap/Include/pcap-stdinc.h
index 417604177b1..ae67996495e 100644
--- a/3rdparty/winpcap/Include/pcap-stdinc.h
+++ b/3rdparty/winpcap/Include/pcap-stdinc.h
@@ -60,13 +60,15 @@
#define caddr_t char*
-#if _MSC_VER < 1500
+#if defined(_MSC_VER) && (_MSC_VER < 1500)
#define snprintf _snprintf
#define vsnprintf _vsnprintf
#define strdup _strdup
#endif
+#if defined(_MSC_VER) && (_MSC_VER < 1700)
#define inline __inline
+#endif
#ifdef __MINGW32__
#include <stdint.h>