Commit 09b1ec68 authored by Paul Bakker's avatar Paul Bakker
Browse files

- Adapted define for inline to be more solid

parent 73043766
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
#include <string.h> #include <string.h>
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(inline)
#define inline _inline #define inline _inline
#else #else
#if defined(__ARMCC_VERSION) #if defined(__ARMCC_VERSION) && !defined(inline)
#define inline __inline #define inline __inline
#endif /* __ARMCC_VERSION */ #endif /* __ARMCC_VERSION */
#endif /*_MSC_VER */ #endif /*_MSC_VER */
......
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
#include <string.h> #include <string.h>
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(inline)
#define inline _inline #define inline _inline
#else #else
#if defined(__ARMCC_VERSION) #if defined(__ARMCC_VERSION) && !defined(inline)
#define inline __inline #define inline __inline
#endif /* __ARMCC_VERSION */ #endif /* __ARMCC_VERSION */
#endif /*_MSC_VER */ #endif /*_MSC_VER */
......
...@@ -41,10 +41,10 @@ ...@@ -41,10 +41,10 @@
#include "polarssl/pkcs11.h" #include "polarssl/pkcs11.h"
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(inline)
#define inline _inline #define inline _inline
#else #else
#if defined(__ARMCC_VERSION) #if defined(__ARMCC_VERSION) && !defined(inline)
#define inline __inline #define inline __inline
#endif /* __ARMCC_VERSION */ #endif /* __ARMCC_VERSION */
#endif /*_MSC_VER */ #endif /*_MSC_VER */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment