commit cfd1ba9f7ca45159ef209e0ce981160cf18d8cda
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:55 2015 +0100
tree 202fb0ded1283f82756d74a9aad7ecbff6e592ff
parent 0123405f323447148e7f79c6c7295696740ba100

Fix spurious #endif from previous cherry-pick

include/polarssl/cipher.h

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