From 680dd540eb3904dae984eb2dee1f72134f6d8f42 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 11 Nov 2014 18:56:05 +0000
Subject: [PATCH] Fix a compiler error on VS2013

---
 mswin32/pcap-include/pcap-stdinc.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mswin32/pcap-include/pcap-stdinc.h b/mswin32/pcap-include/pcap-stdinc.h
index 417604177..2d1acb6ad 100644
--- a/mswin32/pcap-include/pcap-stdinc.h
+++ b/mswin32/pcap-include/pcap-stdinc.h
@@ -66,7 +66,11 @@
 #define strdup _strdup
 #endif
 
+#ifndef __cplusplus
+/* C++ has the inline keyword.
+ * Additionally, C++11 forbids redefining a keyword as a macro */
 #define inline __inline 
+#endif
 
 #ifdef __MINGW32__
 #include <stdint.h>