From 666de2899835cffbf1c78398ae16d3cfa9ad277c Mon Sep 17 00:00:00 2001
From: regehr <regehr>
Date: Thu, 14 Feb 2008 23:38:27 +0000
Subject: [PATCH] annotation tweak

---
 tos/lib/safe/include/annots_stage1.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tos/lib/safe/include/annots_stage1.h b/tos/lib/safe/include/annots_stage1.h
index f7ea1fb3..84ba4586 100644
--- a/tos/lib/safe/include/annots_stage1.h
+++ b/tos/lib/safe/include/annots_stage1.h
@@ -10,6 +10,14 @@ struct @nonnull @deputy_scope() @macro("__DEPUTY_NONNULL") { };
 #define SINGLE                                 @single()
 #define NONNULL                                @nonnull()
 
+#else // NESC < 130
+
+#ifdef SAFE_TINYOS
+#error Safe TinyOS requires nesC >= 1.3.0
+#endif
+
+#endif // NESC version check
+
 #ifdef SAFE_TINYOS
 #define TCAST(__type,__expr)                   ((__type)((void * __DEPUTY_TRUSTED __DEPUTY_COPYTYPE)(__expr)))
 #define __DEPUTY_TRUSTED                       __attribute__((trusted))
@@ -18,10 +26,3 @@ struct @nonnull @deputy_scope() @macro("__DEPUTY_NONNULL") { };
 #define TCAST(__type,__expr)                   ((__type)(__expr))                
 #endif
 
-#else // NESC < 130
-
-#ifdef SAFE_TINYOS
-#error Safe TinyOS requires nesC >= 1.3.0
-#endif
-
-#endif
-- 
2.39.2