don't use __attribute__ for nesC attributes

[tinyos-2.x.git] / tos / lib / tosboot / micaz / avrhardware.h

diff --git a/tos/lib/tosboot/micaz/avrhardware.h b/tos/lib/tosboot/micaz/avrhardware.h
index 15a3e87d675b7fe1397454ab35f3c16f1c9959fb..0dde2a1e24a1538c4b7a2e993cb7f367ee2452f9 100644 (file)
--- a/tos/lib/tosboot/micaz/avrhardware.h
+++ b/tos/lib/tosboot/micaz/avrhardware.h
@@ -133,10 +133,10 @@ static inline void TOSH_MAKE_##alias##_INPUT()  {TOSH_MAKE_##connector##_INPUT()
 
 // We need slightly different defs than SIGNAL, INTERRUPT
 #define TOSH_SIGNAL(signame)                                   \
-void signame() __attribute__ ((signal, spontaneous, C))
+  void signame() __attribute__ ((signal)) @spontaneous() @C()
 
 #define TOSH_INTERRUPT(signame)                                \
-void signame() __attribute__ ((interrupt, spontaneous, C))
+  void signame() __attribute__ ((interrupt)) @spontaneous() @C()
 
 /* Watchdog Prescaler
  */
@@ -166,14 +166,14 @@ void TOSH_wait()
 
 /* #ifndef NESC_BUILD_BINARY */
 
-/* inline __nesc_atomic_t __nesc_atomic_start(void) __attribute__((spontaneous)) */
+/* inline __nesc_atomic_t __nesc_atomic_start(void) @spontaneous() */
 /* { */
 /*   __nesc_atomic_t result = inp(SREG); */
 /*   cli(); */
 /*   return result; */
 /* } */
 
-/* inline void __nesc_atomic_end(__nesc_atomic_t oldSreg) __attribute__((spontaneous)) */
+/* inline void __nesc_atomic_end(__nesc_atomic_t oldSreg) @spontaneous() */
 /* { */
 /*   outp(oldSreg, SREG); */
 /* } */