Don't define inline if compiling C++ on Win32
authorLuke Howard <lukeh@padl.com>
Wed, 5 Sep 2012 01:38:53 +0000 (11:38 +1000)
committerLuke Howard <lukeh@padl.com>
Wed, 5 Sep 2012 11:40:52 +0000 (21:40 +1000)
libeap/src/utils/common.h
mech_eap/util.h

index 96ff59c..f2ec88b 100644 (file)
@@ -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
index 4f54d41..ee62334 100644 (file)
@@ -73,7 +73,9 @@
 #include <krb5.h>
 
 #ifdef WIN32
-#define inline __inline
+# ifndef __cplusplus
+# define inline __inline
+# endif
 #define snprintf _snprintf
 #endif