Merge pull request #8515 from mschulz-at-hilscher/fixes/pragma-error-gcc452
Fix compiler error on gcc 4.5.2.
This commit is contained in:
commit
4e9d5aa2ba
1 changed files with 2 additions and 2 deletions
|
@ -31,7 +31,7 @@
|
||||||
* Disable -Wredundant-decls so that gcc does not warn about this. This is re-enabled
|
* Disable -Wredundant-decls so that gcc does not warn about this. This is re-enabled
|
||||||
* at the bottom of this file.
|
* at the bottom of this file.
|
||||||
*/
|
*/
|
||||||
#ifdef __GNUC__
|
#if defined(MBEDTLS_COMPILER_IS_GCC) && (__GNUC__ > 4)
|
||||||
#pragma GCC diagnostic push
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wredundant-decls"
|
#pragma GCC diagnostic ignored "-Wredundant-decls"
|
||||||
#endif
|
#endif
|
||||||
|
@ -548,7 +548,7 @@ static inline mbedtls_ct_condition_t mbedtls_ct_bool_not(mbedtls_ct_condition_t
|
||||||
return (mbedtls_ct_condition_t) (~x);
|
return (mbedtls_ct_condition_t) (~x);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __GNUC__
|
#if defined(MBEDTLS_COMPILER_IS_GCC) && (__GNUC__ > 4)
|
||||||
/* Restore warnings for -Wredundant-decls on gcc */
|
/* Restore warnings for -Wredundant-decls on gcc */
|
||||||
#pragma GCC diagnostic pop
|
#pragma GCC diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue