commit 21a65e00113d934da3a770d3741e319abc7c71f1
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu Jun 07 11:54:17 2018 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu Jun 07 11:54:17 2018 +0200
tree e7eda548808584947f042d07ba0b52cffd866b1c
parent 2adb375c50e2db5f44dd1ce8b7cb4b33b035563a

Fix usage of inline with for some compilers

library/chacha20.c

diff --git a/library/chacha20.c b/library/chacha20.c
index 903f55f..d14a51e 100644
--- a/library/chacha20.c
+++ b/library/chacha20.c
@@ -48,6 +48,11 @@
 
 #if !defined(MBEDTLS_CHACHA20_ALT)
 
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+    !defined(inline) && !defined(__cplusplus)
+#define inline __inline
+#endif
+
 #define BYTES_TO_U32_LE( data, offset )                           \
     ( (uint32_t) data[offset]                                     \
           | (uint32_t) ( (uint32_t) data[( offset ) + 1] << 8 )   \

library/poly1305.c

diff --git a/library/poly1305.c b/library/poly1305.c
index bafe613..e22d3af 100644
--- a/library/poly1305.c
+++ b/library/poly1305.c
@@ -44,6 +44,11 @@
 
 #if !defined(MBEDTLS_POLY1305_ALT)
 
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+    !defined(inline) && !defined(__cplusplus)
+#define inline __inline
+#endif
+
 #define POLY1305_BLOCK_SIZE_BYTES ( 16U )
 
 #define BYTES_TO_U32_LE( data, offset )                           \