commit cf1db3cf1c0ad995837c475e268754211059af27
author Manuel Pégourié-Gonnard <mpg2@elzevir.fr> Mon Oct 05 14:57:01 2015 +0100
committer Manuel Pégourié-Gonnard <mpg2@elzevir.fr> Mon Oct 05 14:57:01 2015 +0100
tree ff928b99f125e2a2e2291e54ead4768b39115c8c
parent 20607bb0fa279d2c0118caffd61988930219bb62

Fix spurious #endif from previous cherry-pick

include/polarssl/cipher.h

diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h
index f4be4ab..bde1d47 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. */

include/polarssl/pkcs11.h

diff --git a/include/polarssl/pkcs11.h b/include/polarssl/pkcs11.h
index 80be23f..4ca4a4c 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" {

library/ecp_curves.c

diff --git a/library/ecp_curves.c b/library/ecp_curves.c
index 7d26cb5..f5afe44 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: