From: regehr <regehr>
Date: Tue, 19 Feb 2008 05:13:08 +0000 (+0000)
Subject: need to include the safe tinyos annotations here too
X-Git-Tag: release_tinyos_2_1_0_0~524
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=1b97b96efec13d9fb50094f01e6ecb6a23aca89a;p=tinyos-2.x.git

need to include the safe tinyos annotations here too
---

diff --git a/tos/lib/tossim/tos.h b/tos/lib/tossim/tos.h
index 886b294a..d02c2e1e 100644
--- 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;