Fix spurious #endif from previous cherry-pick

This commit is contained in:
Manuel Pégourié-Gonnard 2015-10-05 14:57:01 +01:00
parent 20607bb0fa
commit cf1db3cf1c
3 changed files with 3 additions and 6 deletions

View File

@ -50,8 +50,7 @@
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \ #if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
!defined(inline) && !defined(__cplusplus) !defined(inline) && !defined(__cplusplus)
#define inline __inline #define inline __inline
#endif /* __ARMCC_VERSION */ #endif
#endif /*_MSC_VER */
#define POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE -0x6080 /**< The selected feature is not available. */ #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. */ #define POLARSSL_ERR_CIPHER_BAD_INPUT_DATA -0x6100 /**< Bad input parameters to function. */

View File

@ -41,8 +41,7 @@
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \ #if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
!defined(inline) && !defined(__cplusplus) !defined(inline) && !defined(__cplusplus)
#define inline __inline #define inline __inline
#endif /* __ARMCC_VERSION */ #endif
#endif /*_MSC_VER */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -35,8 +35,7 @@
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \ #if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
!defined(inline) && !defined(__cplusplus) !defined(inline) && !defined(__cplusplus)
#define inline __inline #define inline __inline
#endif /* __ARMCC_VERSION */ #endif
#endif /*_MSC_VER */
/* /*
* Conversion macros for embedded constants: * Conversion macros for embedded constants: