From a9e90d6a6e86a209966b34d8380ac74bc5af7835 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 18 May 2019 11:05:30 +0200 Subject: [PATCH] Compilation fix again (no possible to avoid it with VC++ ???) --- radio/src/storage/conversions/datastructs_218.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/radio/src/storage/conversions/datastructs_218.h b/radio/src/storage/conversions/datastructs_218.h index 47273be12..a54425842 100644 --- a/radio/src/storage/conversions/datastructs_218.h +++ b/radio/src/storage/conversions/datastructs_218.h @@ -413,6 +413,12 @@ PACK(struct ModelHeader_v218 { MODEL_HEADER_BITMAP_FIELD_218 }); +#if defined(COLORLCD) +#define SWITCH_WARNING_DATA_218 +#else +#define SWITCH_WARNING_DATA_218 swarnenable_t switchWarningEnable; +#endif + PACK(struct ModelData_v218 { ModelHeader_v218 header; TimerData_v218 timers[MAX_TIMERS_218]; @@ -444,9 +450,7 @@ PACK(struct ModelData_v218 { swarnstate_t switchWarningState; -#if !defined(COLORLCD) - swarnenable_t switchWarningEnable; -#endif + SWITCH_WARNING_DATA_218 GVarData_v218 gvars[MAX_GVARS_218];