one more tos.h file that needs to explicitly include the Safe TinyOS macros

diff --git a/tos/lib/tossim/sf/sim/tos.h b/tos/lib/tossim/sf/sim/tos.h
index 5b9ca353b5aef01334581e3f58b280d4fa8abb34..d24fe6417933b2ba83d1ba15a9d278780abecf6d 100644 (file)
--- a/tos/lib/tossim/sf/sim/tos.h
+++ b/tos/lib/tossim/sf/sim/tos.h
@@ -54,6 +54,14 @@
 #include <ctype.h>
 #include <stdio.h>
 
+/* 
+ * TEMPORARY: include the Safe TinyOS macros so that annotations get
+ * defined away for non-safe users -- this will no longer be necessary
+ * after we require users to use the ncc that has Safe TinyOS
+ * support 
+ */
+#include "../../lib/safe/include/annots_stage1.h"
+
 #ifndef __cplusplus
 typedef uint8_t bool;
 #endif