From 60d8d08c522cb70355c6b062fff721c54f35f595 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sat, 10 Jan 2015 12:24:05 +0100
Subject: [PATCH] Compile fixes (nw)

---
 3rdparty/winpcap/Include/bittypes.h    | 4 ++--
 3rdparty/winpcap/Include/pcap-stdinc.h | 4 +++-
 src/osd/sdl/sdl.mak                    | 2 +-
 src/osd/windows/windows.mak            | 2 +-
 4 files changed, 7 insertions(+), 5 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>
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index ccffac75644..c389dbb0e7a 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -334,7 +334,7 @@ SDLMAIN = $(SDLOBJ)/main.o
 # needed for unidasm
 LDFLAGS += -Wl,--allow-multiple-definition
 SDL_NETWORK = pcap
-INCPATH += -I$(3RDPARTY)/winpcap
+INCPATH += -I$(3RDPARTY)/winpcap/Include
 
 # enable UNICODE
 DEFS += -Dmain=utf8_main -DUNICODE -D_UNICODE
diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak
index 7b444aad01b..d36bdf59506 100644
--- a/src/osd/windows/windows.mak
+++ b/src/osd/windows/windows.mak
@@ -442,7 +442,7 @@ endif
 #-------------------------------------------------
 # WinPCap
 #-------------------------------------------------
-INCPATH += -I$(3RDPARTY)/winpcap
+INCPATH += -I$(3RDPARTY)/winpcap/Include
 
 #-------------------------------------------------
 # rules for building the libaries