commit 09b1ec68c8835c5230b26146d0f74a688031d37f
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

 - Adapted define for inline to be more solid

include/polarssl/cipher.h

diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h
index 9452f73..0f6dda5 100644
--- a/include/polarssl/cipher.h
+++ b/include/polarssl/cipher.h
@@ -32,10 +32,10 @@
 
 #include <string.h>
 
-#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 */

include/polarssl/md.h

diff --git a/include/polarssl/md.h b/include/polarssl/md.h
index 2f0f6e8..aaafa8b 100644
--- a/include/polarssl/md.h
+++ b/include/polarssl/md.h
@@ -32,10 +32,10 @@
 
 #include <string.h>
 
-#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 */

include/polarssl/ssl.h

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 */