From cfd1ba9f7ca45159ef209e0ce981160cf18d8cda 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 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h
index 006b1040e..d50cb74b8 100644
--- a/include/polarssl/cipher.h
+++ b/include/polarssl/cipher.h
@@ -32,8 +32,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 5fd952d92..3b07c8497 100644
--- a/include/polarssl/pkcs11.h
+++ b/include/polarssl/pkcs11.h
@@ -37,8 +37,7 @@
 #if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
     !defined(inline) && !defined(__cplusplus)
 #define inline __inline
-#endif /* __ARMCC_VERSION */
-#endif /*_MSC_VER */
+#endif
 
 /**
  * Context for PKCS #11 private keys.