annotation tweak

diff --git a/tos/lib/safe/include/annots_stage1.h b/tos/lib/safe/include/annots_stage1.h
index f7ea1fb3618e147c64b4654a821f1177300125e4..84ba4586ce653f54674a01098e64b00515d185ce 100644 (file)
--- 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