From: Keith Packard <keithp@keithp.com>
Date: Mon, 16 Sep 2019 00:05:59 +0000 (-0700)
Subject: drivers: Use 'main_value' instead of 'main'
X-Git-Tag: 1.9.1~1^2~42
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=46d3cbadce6808b4cd29ad1e034efac7b5e4fa42

drivers: Use 'main_value' instead of 'main'

GCC can emit a warning when programs redefine 'main'.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/drivers/ao_aprs.c b/src/drivers/ao_aprs.c
index 2f17d044..bc5c29df 100644
--- a/src/drivers/ao_aprs.c
+++ b/src/drivers/ao_aprs.c
@@ -527,7 +527,7 @@ static int tncComment(uint8_t *buf)
 	int16_t apogee = ao_ignite_decivolt(AO_SENSE_DROGUE(&packet));
 #endif
 #ifdef AO_SENSE_MAIN
-	int16_t main = ao_ignite_decivolt(AO_SENSE_MAIN(&packet));
+	int16_t main_value = ao_ignite_decivolt(AO_SENSE_MAIN(&packet));
 #endif
 
 	return sprintf((char *) buf,
@@ -548,8 +548,8 @@ static int tncComment(uint8_t *buf)
 		       apogee%10
 #endif
 #ifdef AO_SENSE_MAIN
-		       , main/10,
-		       main%10
+		       , main_value/10,
+		       main_value%10
 #endif
 		       , ao_serial_number
 		);