diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h
index 9452f733e..0f6dda5a8 100644
--- a/include/polarssl/cipher.h
+++ b/include/polarssl/cipher.h
@@ -32,10 +32,10 @@
 
 #include <string.h>
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(inline)
 #define inline _inline
 #else
-#if defined(__ARMCC_VERSION)
+#if defined(__ARMCC_VERSION) && !defined(inline)
 #define inline __inline
 #endif /* __ARMCC_VERSION */
 #endif /*_MSC_VER */
diff --git a/include/polarssl/md.h b/include/polarssl/md.h
index 2f0f6e89f..aaafa8b88 100644
--- a/include/polarssl/md.h
+++ b/include/polarssl/md.h
@@ -32,10 +32,10 @@
 
 #include <string.h>
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(inline)
 #define inline _inline
 #else
-#if defined(__ARMCC_VERSION)
+#if defined(__ARMCC_VERSION) && !defined(inline)
 #define inline __inline
 #endif /* __ARMCC_VERSION */
 #endif /*_MSC_VER */
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index d98eaedc5..c39c7629d 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -41,10 +41,10 @@
 #include "polarssl/pkcs11.h"
 #endif
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(inline)
 #define inline _inline
 #else
-#if defined(__ARMCC_VERSION)
+#if defined(__ARMCC_VERSION) && !defined(inline)
 #define inline __inline
 #endif /* __ARMCC_VERSION */
 #endif /*_MSC_VER */