commit c0bb66f47ea6101ba077f7a037ebd52a85574c45
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Wed Feb 28 12:38:04 2018 +0100
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu Mar 01 09:25:05 2018 +0100
tree 2ad7aa01d2abf50831bfa58964270a4929af2be0
parent 22997b7200575a94e77a87b2aa45cdfceb289494

aria: improve compiler inline compatibility

library/aria.c

diff --git a/library/aria.c b/library/aria.c
index 41ed759..a9b8871 100644
--- a/library/aria.c
+++ b/library/aria.c
@@ -48,6 +48,11 @@
 
 #if !defined(MBEDTLS_ARIA_ALT)
 
+#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
+    !defined(inline) && !defined(__cplusplus)
+#define inline __inline
+#endif
+
 /* Implementation that should never be optimized out by the compiler */
 static void mbedtls_zeroize( void *v, size_t n ) {
     volatile unsigned char *p = (unsigned char*)v; while( n-- ) *p++ = 0;
@@ -97,7 +102,7 @@
 }
 #define ARIA_P1 aria_p1
 #elif defined(__ARMCC_VERSION) && __ARMCC_VERSION < 6000000
-static __inline uint32_t aria_p1( uint32_t x )
+static inline uint32_t aria_p1( uint32_t x )
 {
     uint32_t r;
     __asm( "rev16 r, x" );
@@ -146,7 +151,7 @@
 }
 #define ARIA_P3 aria_p3
 #elif defined(__ARMCC_VERSION) && __ARMCC_VERSION < 6000000
-static __inline uint32_t aria_p3( uint32_t x )
+static inline uint32_t aria_p3( uint32_t x )
 {
     uint32_t r;
     __asm( "rev r, x" );