Still need to #define inline for MSVC

I only tested with VS2015 earlier, but previous versions apparently still
don't know that standard C99 keyword though it's documented on MSDN...
parent e540b49a
......@@ -47,9 +47,9 @@
#define MBEDTLS_CIPHER_MODE_STREAM
#endif
#if defined(__ARMCC_VERSION) && !defined(inline)
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline)
#define inline __inline
#endif /* __ARMCC_VERSION */
#endif
#define MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE -0x6080 /**< The selected feature is not available. */
#define MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA -0x6100 /**< Bad input parameters to function. */
......
......@@ -28,9 +28,9 @@
#include <stddef.h>
#if defined(__ARMCC_VERSION) && !defined(inline)
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline)
#define inline __inline
#endif /* __ARMCC_VERSION */
#endif
#define MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE -0x5080 /**< The selected feature is not available. */
#define MBEDTLS_ERR_MD_BAD_INPUT_DATA -0x5100 /**< Bad input parameters to function. */
......
......@@ -38,9 +38,9 @@
#include <pkcs11-helper-1.0/pkcs11h-certificate.h>
#if defined(__ARMCC_VERSION) && !defined(inline)
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline)
#define inline __inline
#endif /* __ARMCC_VERSION */
#endif
#ifdef __cplusplus
extern "C" {
......
......@@ -42,9 +42,9 @@
#include "sha512.h"
#endif
#if defined(__ARMCC_VERSION) && !defined(inline)
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline)
#define inline __inline
#endif /* __ARMCC_VERSION */
#endif
/* Determine minimum supported version */
#define MBEDTLS_SSL_MIN_MAJOR_VERSION MBEDTLS_SSL_MAJOR_VERSION_3
......
......@@ -63,9 +63,9 @@
#define mbedtls_free free
#endif
#if defined(__ARMCC_VERSION) && !defined(inline)
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline)
#define inline __inline
#endif /* __ARMCC_VERSION */
#endif
/* Implementation that should never be optimized out by the compiler */
static void mbedtls_zeroize( void *v, size_t n ) {
......
......@@ -32,9 +32,9 @@
#include <string.h>
#if defined(__ARMCC_VERSION) && !defined(inline)
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && !defined(inline)
#define inline __inline
#endif /* __ARMCC_VERSION */
#endif
/*
* Conversion macros for embedded constants:
......
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