need to include the safe tinyos annotations here too

[tinyos-2.x.git] / tos / lib / tossim / tos.h

diff --git a/tos/lib/tossim/tos.h b/tos/lib/tossim/tos.h
index 1126b2bd21105e3fbe23e46a928c6c5648b98dbb..d02c2e1ec55e22adac53f6d6026af6eb7f86499d 100644 (file)
--- a/tos/lib/tossim/tos.h
+++ b/tos/lib/tossim/tos.h
@@ -57,6 +57,14 @@
 typedef uint8_t bool;
 #endif
 
+/* 
+ * 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"
+
 enum { FALSE = 0, TRUE = 1 };
 
 extern uint16_t TOS_NODE_ID;
@@ -86,7 +94,6 @@ struct @exactlyonce { };
 #include <heap.c>
 #include <sim_event_queue.c>
 #include <sim_tossim.c>
-#include <hashtable.c>
 #include <sim_mac.c>
 #include <sim_packet.c>
 #endif