From cf1db3cf1c0ad995837c475e268754211059af27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg2@elzevir.fr>
Date: Mon, 5 Oct 2015 14:57:01 +0100
Subject: [PATCH] Fix spurious #endif from previous cherry-pick

---
 include/polarssl/cipher.h | 3 +--
 include/polarssl/pkcs11.h | 3 +--
 library/ecp_curves.c      | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h
index f4be4ab3d..bde1d4706 100644
--- a/include/polarssl/cipher.h
+++ b/include/polarssl/cipher.h
@@ -50,8 +50,7 @@
 #if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
     !defined(inline) && !defined(__cplusplus)
 #define inline __inline
-#endif /* __ARMCC_VERSION */
-#endif /*_MSC_VER */
+#endif
 
 #define POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE            -0x6080  /**< The selected feature is not available. */
 #define POLARSSL_ERR_CIPHER_BAD_INPUT_DATA                 -0x6100  /**< Bad input parameters to function. */
diff --git a/include/polarssl/pkcs11.h b/include/polarssl/pkcs11.h
index 80be23faf..4ca4a4cdf 100644
--- a/include/polarssl/pkcs11.h
+++ b/include/polarssl/pkcs11.h
@@ -41,8 +41,7 @@
 #if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
     !defined(inline) && !defined(__cplusplus)
 #define inline __inline
-#endif /* __ARMCC_VERSION */
-#endif /*_MSC_VER */
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/library/ecp_curves.c b/library/ecp_curves.c
index 7d26cb5b2..f5afe44b5 100644
--- a/library/ecp_curves.c
+++ b/library/ecp_curves.c
@@ -35,8 +35,7 @@
 #if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
     !defined(inline) && !defined(__cplusplus)
 #define inline __inline
-#endif /* __ARMCC_VERSION */
-#endif /*_MSC_VER */
+#endif
 
 /*
  * Conversion macros for embedded constants: