From c5b77b180a2eb6a1572bb86ddb382151c6839251 Mon Sep 17 00:00:00 2001
From: Gus Grubba <gus@grubba.com>
Date: Fri, 26 Oct 2018 11:51:53 -0400
Subject: [PATCH] Fix annoying Android warnings.

---
 src/comm/MAVLinkProtocol.cc | 2 ++
 src/comm/MAVLinkProtocol.h  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/comm/MAVLinkProtocol.cc b/src/comm/MAVLinkProtocol.cc
index dff9c3c4b..db86ad8ef 100644
--- a/src/comm/MAVLinkProtocol.cc
+++ b/src/comm/MAVLinkProtocol.cc
@@ -68,6 +68,8 @@ MAVLinkProtocol::MAVLinkProtocol(QGCApplication* app, QGCToolbox* toolbox)
     memset(totalLossCounter,    0, sizeof(totalLossCounter));
     memset(runningLossPercent,  0, sizeof(runningLossPercent));
     memset(firstMessage,        1, sizeof(firstMessage));
+    memset(&_status,            0, sizeof(_status));
+    memset(&_message,           0, sizeof(_message));
 }
 
 MAVLinkProtocol::~MAVLinkProtocol()
diff --git a/src/comm/MAVLinkProtocol.h b/src/comm/MAVLinkProtocol.h
index 35947162b..cd2a30568 100644
--- a/src/comm/MAVLinkProtocol.h
+++ b/src/comm/MAVLinkProtocol.h
@@ -108,8 +108,8 @@ protected:
     uint64_t    totalLossCounter[MAVLINK_COMM_NUM_BUFFERS];     ///< Total messages lost during transmission.
     float       runningLossPercent[MAVLINK_COMM_NUM_BUFFERS];   ///< Loss rate
 
-    mavlink_message_t _message = {};
-    mavlink_status_t _status   = {};
+    mavlink_message_t _message;
+    mavlink_status_t _status;
 
     bool        versionMismatchIgnore;
     int         systemId;
-- 
2.22.0