diff options
| author | Ha Thach <[email protected]> | 2022-02-28 17:02:33 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-02-28 17:02:33 +0700 |
| commit | 8e84529c8d008b4440e70863f16848791f684d96 (patch) | |
| tree | 63e34dcef037f21476903f681131984b6c7a4fd4 /src/common | |
| parent | c9b0fbc907495b393d0d76281ce6ed4ecf46c27c (diff) | |
| parent | 81e33477ea2d2a4f056d8d9c4cacfbbd7a4bc8e8 (diff) | |
Merge pull request #1345 from alexandre-perrin/iar-cpp-verify-static
Fix CPP compilation with IAR
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/tusb_compiler.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/tusb_compiler.h b/src/common/tusb_compiler.h index 8f1de7162..ae00f4e75 100644 --- a/src/common/tusb_compiler.h +++ b/src/common/tusb_compiler.h @@ -51,10 +51,10 @@ #endif // Compile-time Assert -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L - #define TU_VERIFY_STATIC _Static_assert -#elif defined (__cplusplus) && __cplusplus >= 201103L +#if defined (__cplusplus) && __cplusplus >= 201103L #define TU_VERIFY_STATIC static_assert +#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L + #define TU_VERIFY_STATIC _Static_assert #elif defined(__CCRX__) #define TU_VERIFY_STATIC(const_expr, _mess) typedef char TU_XSTRCAT(Line, __LINE__)[(const_expr) ? 1 : 0]; #else |