From: regehr <regehr>
Date: Tue, 19 Feb 2008 17:01:04 +0000 (+0000)
Subject: one more tos.h file that needs to explicitly include the Safe TinyOS macros
X-Git-Tag: release_tinyos_2_1_0_0~522
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=bc614e3134e602923a36a9850c4f07a7b3693917;p=tinyos-2.x.git

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 5b9ca353..d24fe641 100644
--- 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