From 863272bc52e640d5e973e0628737aaaf64600449 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sat, 5 Mar 2016 08:59:28 +0100
Subject: [PATCH] MSVC errors

---
 radio/src/datastructs.h             | 10 ++++++++--
 radio/src/telemetry/frsky_sport.cpp |  3 +++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index 45af58136..b46bf607a 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -350,6 +350,12 @@ PACK(struct CustomFunctionData {
 
 typedef int16_t gvar_t;
 
+#if MAX_ROTARY_ENCODERS > 0
+  #define FLIGHT_MODE_ROTARY_ENCODERS_FIELD int16_t rotaryEncoders[MAX_ROTARY_ENCODERS];
+#else
+  #define FLIGHT_MODE_ROTARY_ENCODERS_FIELD
+#endif
+
 #if defined(CPUARM)
 PACK(struct FlightModeData {
   trim_t trim[4];
@@ -358,7 +364,7 @@ PACK(struct FlightModeData {
   int16_t spare:7;
   uint8_t fadeIn;
   uint8_t fadeOut;
-  int16_t rotaryEncoders[MAX_ROTARY_ENCODERS];
+  FLIGHT_MODE_ROTARY_ENCODERS_FIELD
   gvar_t gvars[MAX_GVARS];
 });
 #elif !defined(PCBSTD)
@@ -368,7 +374,7 @@ PACK(struct FlightModeData {
   NOBACKUP(char name[LEN_FLIGHT_MODE_NAME]);
   uint8_t fadeIn:4;
   uint8_t fadeOut:4;
-  int16_t rotaryEncoders[MAX_ROTARY_ENCODERS];
+  FLIGHT_MODE_ROTARY_ENCODERS_FIELD
   gvar_t gvars[MAX_GVARS];
 });
 #else
diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp
index dfe6440f2..8050ac2cf 100644
--- a/radio/src/telemetry/frsky_sport.cpp
+++ b/radio/src/telemetry/frsky_sport.cpp
@@ -272,7 +272,10 @@ void processSportPacket(uint8_t * packet)
         else if (id >= DIY_FIRST_ID && id <= DIY_LAST_ID) {
 #if defined(LUA)
           if (luaInputTelemetryFifo) {
+#if defined __GNUC__
+            // TODO remove this ifdef when we have updated to MSVC recent version
             luaInputTelemetryFifo->push((LuaTelemetryValue){(uint8_t)id, data});
+#endif
           }
 #endif
         }