From 21f66f5208ea28a2d1243e70d67630ecbeee62e0 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 10 Aug 2019 16:25:17 +0200 Subject: [PATCH] remove "deprecated 'register'" warning with clang (#6607) --- .../targets/common/arm/stm32/board_common.h | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/radio/src/targets/common/arm/stm32/board_common.h b/radio/src/targets/common/arm/stm32/board_common.h index 58c83d5f7..add5ccbde 100644 --- a/radio/src/targets/common/arm/stm32/board_common.h +++ b/radio/src/targets/common/arm/stm32/board_common.h @@ -26,7 +26,17 @@ #if defined(LUA_EXPORT_GENERATION) // no includes -#elif defined(STM32F4) +#else + +#if __clang__ +// clang is very picky about the use of "register" +// Tell clang to ignore the warnings for the following files +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-register" +#endif + +#if defined(STM32F4) + #include "STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h" #include "STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rcc.h" #include "STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_syscfg.h" @@ -62,22 +72,17 @@ #include "STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/inc/misc.h" #endif -#if defined(__cplusplus) && !defined(SIMU) -extern "C" { -#endif - -#if __clang__ -// clang is very picky about the use of "register" -// Tell clang to ignore the warnings for the following files -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-register" -#endif - #if __clang__ // Restore warnings about registers #pragma clang diagnostic pop #endif +#endif + +#if defined(__cplusplus) && !defined(SIMU) +extern "C" { +#endif + #include "usb_driver.h" #if !defined(SIMU)