Fix macroization of inline in C++
When compiling as C++, MSVC complains about our macroization of a keyword.
Stop doing that as we know inline is always available in C++
diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h
index 00c42c1..f4be4ab 100644
--- a/include/polarssl/cipher.h
+++ b/include/polarssl/cipher.h
@@ -47,10 +47,8 @@
#define POLARSSL_CIPHER_MODE_STREAM
#endif
-#if defined(_MSC_VER) && !defined(inline)
-#define inline _inline
-#else
-#if defined(__ARMCC_VERSION) && !defined(inline)
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+ !defined(inline) && !defined(__cplusplus)
#define inline __inline
#endif /* __ARMCC_VERSION */
#endif /*_MSC_VER */