From: Luke Howard <lukeh@padl.com>
Date: Wed, 5 Sep 2012 01:38:53 +0000 (+1000)
Subject: Don't define inline if compiling C++ on Win32
X-Git-Tag: 0.9.2~81
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=commitdiff_plain;h=292cd44d89badf8f7451c9749e4ccc59ba6128ab

Don't define inline if compiling C++ on Win32
---

diff --git a/libeap/src/utils/common.h b/libeap/src/utils/common.h
index 96ff59c..f2ec88b 100644
--- a/libeap/src/utils/common.h
+++ b/libeap/src/utils/common.h
@@ -87,7 +87,9 @@ typedef int socklen_t;
 #endif /* CONFIG_NATIVE_WINDOWS */
 
 #ifdef _MSC_VER
+#ifndef __cplusplus
 #define inline __inline
+#endif
 
 #undef vsnprintf
 #define vsnprintf _vsnprintf
diff --git a/mech_eap/util.h b/mech_eap/util.h
index 4f54d41..ee62334 100644
--- a/mech_eap/util.h
+++ b/mech_eap/util.h
@@ -73,7 +73,9 @@
 #include <krb5.h>
 
 #ifdef WIN32
-#define inline __inline
+# ifndef __cplusplus
+# define inline __inline
+# endif
 #define snprintf _snprintf
 #endif