| commit | 09b1ec68c8835c5230b26146d0f74a688031d37f | [log] [tgz] |
|---|---|---|
| author | Paul Bakker <p.j.bakker@polarssl.org> | Wed Jul 27 16:28:54 2011 +0000 |
| committer | Paul Bakker <p.j.bakker@polarssl.org> | Wed Jul 27 16:28:54 2011 +0000 |
| tree | e346722f80cad98b28e621eb0aaeed9574e5a45b | |
| parent | 73043766c711fd701f177c7bbfcb52794700809d [diff] [blame] |
- Adapted define for inline to be more solid
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h index d98eaed..c39c762 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 */