diff options
| -rw-r--r-- | include/lib/cassert.h | 7 | ||||
| -rw-r--r-- | plat/arm/common/arm_bl1_setup.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/lib/cassert.h b/include/lib/cassert.h index 0e5529dd..e8089cbb 100644 --- a/include/lib/cassert.h +++ b/include/lib/cassert.h @@ -34,9 +34,12 @@ /******************************************************************************* * Macro to flag a compile time assertion. It uses the preprocessor to generate * an invalid C construct if 'cond' evaluates to false. - * The following compilation error is triggered if the assertion fails: + * The following compilation error is triggered if the assertion fails: * "error: size of array 'msg' is negative" + * The 'unused' attribute ensures that the unused typedef does not emit a + * compiler warning. ******************************************************************************/ -#define CASSERT(cond, msg) typedef char msg[(cond) ? 1 : -1] +#define CASSERT(cond, msg) \ + typedef char msg[(cond) ? 1 : -1] __attribute__((unused)) #endif /* __CASSERT_H__ */ diff --git a/plat/arm/common/arm_bl1_setup.c b/plat/arm/common/arm_bl1_setup.c index 6970aa31..ddf383fe 100644 --- a/plat/arm/common/arm_bl1_setup.c +++ b/plat/arm/common/arm_bl1_setup.c @@ -35,7 +35,7 @@ #include <console.h> #include <platform_def.h> #include <plat_arm.h> -#include "../../bl1/bl1_private.h" +#include "../../../bl1/bl1_private.h" #if USE_COHERENT_MEM |