commit 4e9d5aa2ba1d7820b309d276fa21f0dc3d257998
author Dave Rodgman <dave.rodgman@arm.com> Mon Nov 27 11:28:30 2023 +0000
committer GitHub <noreply@github.com> Mon Nov 27 11:28:30 2023 +0000
tree 4180e92824d50b64423592a5327c74f4002001f8
parent 9fbac381e6893c2de465b9bbd196a23b02163237
parent 90c8c3235b588dfe711916bc77cfd03440e71f5e

Merge pull request #8515 from mschulz-at-hilscher/fixes/pragma-error-gcc452

Fix compiler error on gcc 4.5.2.

library/constant_time_impl.h

diff --git a/library/constant_time_impl.h b/library/constant_time_impl.h
index 18a967b..2a4574b 100644
--- a/library/constant_time_impl.h
+++ b/library/constant_time_impl.h
@@ -31,7 +31,7 @@
  * Disable -Wredundant-decls so that gcc does not warn about this. This is re-enabled
  * at the bottom of this file.
  */
-#ifdef __GNUC__
+#if defined(MBEDTLS_COMPILER_IS_GCC) && (__GNUC__ > 4)
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wredundant-decls"
 #endif
@@ -548,7 +548,7 @@
     return (mbedtls_ct_condition_t) (~x);
 }
 
-#ifdef __GNUC__
+#if defined(MBEDTLS_COMPILER_IS_GCC) && (__GNUC__ > 4)
 /* Restore warnings for -Wredundant-decls on gcc */
     #pragma GCC diagnostic pop
 #endif