From: Keith Packard <keithp@keithp.com>
Date: Tue, 11 Oct 2011 23:39:35 +0000 (-0600)
Subject: altos/avr: Make ao_arch_critical argument be a statement
X-Git-Tag: 1.0.9.3~11
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=0a186e92c5773c5d908e9cee889d645a8172dcdc;ds=sidebyside

altos/avr: Make ao_arch_critical argument be a statement

Wrap the argument to ao_arch_critical in do { } while (0); to make
sure it gets correctly checked as a statement.

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

diff --git a/src/avr/ao_arch.h b/src/avr/ao_arch.h
index c695a725..2be4abee 100644
--- a/src/avr/ao_arch.h
+++ b/src/avr/ao_arch.h
@@ -143,7 +143,7 @@ extern uint8_t	ao_cpu_sleep_disable;
 		asm("ret");						\
 	} while(0)
 
-#define ao_arch_critical(b) do { cli(); b; sei(); } while (0)
+#define ao_arch_critical(b) do { cli(); do { b } while (0); sei(); } while (0)
 
 #define AO_TELESCIENCE_NUM_ADC	12