avoid making everyone reinstall ncc by including the Safe TinyOS macros from here

diff --git a/tos/system/tos.h b/tos/system/tos.h
index 9b9a17dbed06bbb3b3a4a542f1248132d1e18488..25ec7569946c10a3f1c59c918d183f5f3575b2c3 100644 (file)
--- a/tos/system/tos.h
+++ b/tos/system/tos.h
@@ -16,6 +16,9 @@
 #include <stddef.h>
 #include <ctype.h>
 
+/* TEMPORARY: include the Safe TinyOS macros so that annotations get
+ * defined away for non-safe users */
+#include "../lib/safe/include/annots_stage1.h"
 
 typedef uint8_t bool;
 enum { FALSE = 0, TRUE = 1 };