commit fa6a620b752fde66be4abbaf10b8f6e54a57ed8e
author Paul Bakker <p.j.bakker@polarssl.org> Mon Oct 28 18:48:30 2013 +0100
committer Paul Bakker <p.j.bakker@polarssl.org> Tue Oct 29 14:05:38 2013 +0100
tree dd01a1a2b3a1644e4a9756ae65c330bada0b2f30
parent 178d9bac3c9c23307246f4e06779103d0fe6e0c2

Defines for UEFI environment under MSVC added

include/polarssl/compat-1.2.h

diff --git a/include/polarssl/compat-1.2.h b/include/polarssl/compat-1.2.h
index ce4566c..3e9c396 100644
--- a/include/polarssl/compat-1.2.h
+++ b/include/polarssl/compat-1.2.h
@@ -32,7 +32,14 @@
 // Comment out to disable prototype change warnings
 #define SHOW_PROTOTYPE_CHANGE_WARNINGS
 
-#if defined _MSC_VER
+#if defined(_MSC_VER) && !defined(inline)
+#define inline _inline
+#else
+#if defined(__ARMCC_VERSION) && !defined(inline)
+#define inline __inline
+#endif /* __ARMCC_VERSION */
+
+#if defined(_MSC_VER)
 // MSVC does not support #warning
 #undef SHOW_PROTOTYPE_CHANGE_WARNINGS
 #endif