commit 0223ab9d3885ebdf226a38bccfc1e765ed91704b
author Manuel Pégourié-Gonnard <mpg2@elzevir.fr> Mon Oct 05 11:40:01 2015 +0100
committer Manuel Pégourié-Gonnard <mpg2@elzevir.fr> Mon Oct 05 11:41:36 2015 +0100
tree 75c0643b0d68f357629b9b818eefeef5ca39c936
parent 54eec9d1dd1817bf87c8167805379a0a93769ed2

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++

include/mbedtls/cipher.h

diff --git a/include/mbedtls/cipher.h b/include/mbedtls/cipher.h
index 87d9c79..70000f5 100644
--- a/include/mbedtls/cipher.h
+++ b/include/mbedtls/cipher.h
@@ -46,7 +46,8 @@
 #define MBEDTLS_CIPHER_MODE_STREAM
 #endif
 
-#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline)
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+    !defined(inline) && !defined(__cplusplus)
 #define inline __inline
 #endif