From 2505528be403fffe364664388a6f79abc8c863a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Wed, 1 Jul 2015 17:22:36 +0200
Subject: [PATCH] Rm obsolete defines for inline wiht MSVC

The "inline" keyword is supported since Visual Studio 2005 according to MSDN,
and we require Visual Studio 2010 or higher.
---
 include/mbedtls/cipher.h       | 4 ----
 include/mbedtls/md.h           | 4 ----
 include/mbedtls/pkcs11.h       | 4 ----
 include/mbedtls/ssl_internal.h | 4 ----
 library/ecp.c                  | 4 ----
 library/ecp_curves.c           | 4 ----
 6 files changed, 24 deletions(-)

diff --git a/include/mbedtls/cipher.h b/include/mbedtls/cipher.h
index 6710a004f1..38cdf29779 100644
--- a/include/mbedtls/cipher.h
+++ b/include/mbedtls/cipher.h
@@ -47,13 +47,9 @@
 #define MBEDTLS_CIPHER_MODE_STREAM
 #endif
 
-#if defined(_MSC_VER) && !defined(inline)
-#define inline _inline
-#else
 #if defined(__ARMCC_VERSION) && !defined(inline)
 #define inline __inline
 #endif /* __ARMCC_VERSION */
-#endif /*_MSC_VER */
 
 #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. */
diff --git a/include/mbedtls/md.h b/include/mbedtls/md.h
index 8e5702592e..ad62739756 100644
--- a/include/mbedtls/md.h
+++ b/include/mbedtls/md.h
@@ -28,13 +28,9 @@
 
 #include <stddef.h>
 
-#if defined(_MSC_VER) && !defined(inline)
-#define inline _inline
-#else
 #if defined(__ARMCC_VERSION) && !defined(inline)
 #define inline __inline
 #endif /* __ARMCC_VERSION */
-#endif /*_MSC_VER */
 
 #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. */
diff --git a/include/mbedtls/pkcs11.h b/include/mbedtls/pkcs11.h
index 5d4cc1fe5e..4855331f85 100644
--- a/include/mbedtls/pkcs11.h
+++ b/include/mbedtls/pkcs11.h
@@ -38,13 +38,9 @@
 
 #include <pkcs11-helper-1.0/pkcs11h-certificate.h>
 
-#if defined(_MSC_VER) && !defined(inline)
-#define inline _inline
-#else
 #if defined(__ARMCC_VERSION) && !defined(inline)
 #define inline __inline
 #endif /* __ARMCC_VERSION */
-#endif /*_MSC_VER */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h
index 8d3a3805e7..eebc2149c7 100644
--- a/include/mbedtls/ssl_internal.h
+++ b/include/mbedtls/ssl_internal.h
@@ -42,13 +42,9 @@
 #include "sha512.h"
 #endif
 
-#if defined(_MSC_VER) && !defined(inline)
-#define inline _inline
-#else
 #if defined(__ARMCC_VERSION) && !defined(inline)
 #define inline __inline
 #endif /* __ARMCC_VERSION */
-#endif /*_MSC_VER */
 
 /* Determine minimum supported version */
 #define MBEDTLS_SSL_MIN_MAJOR_VERSION           MBEDTLS_SSL_MAJOR_VERSION_3
diff --git a/library/ecp.c b/library/ecp.c
index b77c4f2ba9..16961e5f14 100644
--- a/library/ecp.c
+++ b/library/ecp.c
@@ -63,13 +63,9 @@
 #define mbedtls_free       free
 #endif
 
-#if defined(_MSC_VER) && !defined(inline)
-#define inline _inline
-#else
 #if defined(__ARMCC_VERSION) && !defined(inline)
 #define inline __inline
 #endif /* __ARMCC_VERSION */
-#endif /*_MSC_VER */
 
 /* Implementation that should never be optimized out by the compiler */
 static void mbedtls_zeroize( void *v, size_t n ) {
diff --git a/library/ecp_curves.c b/library/ecp_curves.c
index 0d391cd12c..c8a320ca66 100644
--- a/library/ecp_curves.c
+++ b/library/ecp_curves.c
@@ -32,13 +32,9 @@
 
 #include <string.h>
 
-#if defined(_MSC_VER) && !defined(inline)
-#define inline _inline
-#else
 #if defined(__ARMCC_VERSION) && !defined(inline)
 #define inline __inline
 #endif /* __ARMCC_VERSION */
-#endif /*_MSC_VER */
 
 /*
  * Conversion macros for embedded constants: