From 09b1ec68c8835c5230b26146d0f74a688031d37f Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Wed, 27 Jul 2011 16:28:54 +0000 Subject: [PATCH] - Adapted define for inline to be more solid --- include/polarssl/cipher.h | 4 ++-- include/polarssl/md.h | 4 ++-- include/polarssl/ssl.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h index 9452f733e..0f6dda5a8 100644 --- a/include/polarssl/cipher.h +++ b/include/polarssl/cipher.h @@ -32,10 +32,10 @@ #include -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(inline) #define inline _inline #else -#if defined(__ARMCC_VERSION) +#if defined(__ARMCC_VERSION) && !defined(inline) #define inline __inline #endif /* __ARMCC_VERSION */ #endif /*_MSC_VER */ diff --git a/include/polarssl/md.h b/include/polarssl/md.h index 2f0f6e89f..aaafa8b88 100644 --- a/include/polarssl/md.h +++ b/include/polarssl/md.h @@ -32,10 +32,10 @@ #include -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(inline) #define inline _inline #else -#if defined(__ARMCC_VERSION) +#if defined(__ARMCC_VERSION) && !defined(inline) #define inline __inline #endif /* __ARMCC_VERSION */ #endif /*_MSC_VER */ diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h index d98eaedc5..c39c7629d 100644 --- a/include/polarssl/ssl.h +++ b/include/polarssl/ssl.h @@ -41,10 +41,10 @@ #include "polarssl/pkcs11.h" #endif -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(inline) #define inline _inline #else -#if defined(__ARMCC_VERSION) +#if defined(__ARMCC_VERSION) && !defined(inline) #define inline __inline #endif /* __ARMCC_VERSION */ #endif /*_MSC_VER */