From 28d98414e7749202e3e2aa4d583d00229d8f28dd Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 11 Dec 2013 10:21:20 +1100
Subject: [PATCH] Copter: fixed some build warnings

---
 ArduCopter/GCS_Mavlink.pde | 3 ++-
 ArduCopter/Parameters.h    | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ArduCopter/GCS_Mavlink.pde b/ArduCopter/GCS_Mavlink.pde
index 77ce49a874..a334aa21cc 100644
--- a/ArduCopter/GCS_Mavlink.pde
+++ b/ArduCopter/GCS_Mavlink.pde
@@ -1105,7 +1105,8 @@ GCS_MAVLINK::send_text_P(gcs_severity severity, const prog_char_t *str)
 
 void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
 {
-    struct Location tell_command = {};                                  // command for telemetry
+    struct Location tell_command;
+    memset(&tell_command, 0, sizeof(tell_command));
 
     switch (msg->msgid) {
 
diff --git a/ArduCopter/Parameters.h b/ArduCopter/Parameters.h
index 14f157c792..f884a948ec 100644
--- a/ArduCopter/Parameters.h
+++ b/ArduCopter/Parameters.h
@@ -379,11 +379,12 @@ public:
     RC_Channel_aux          rc_6;
     RC_Channel_aux          rc_7;
     RC_Channel_aux          rc_8;
+#if CONFIG_HAL_BOARD == HAL_BOARD_PX4
+    RC_Channel_aux          rc_9;
+#endif
     RC_Channel_aux          rc_10;
     RC_Channel_aux          rc_11;
-
 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
-    RC_Channel_aux          rc_9;
     RC_Channel_aux          rc_12;
 #endif