Add SharedArbiterC.

[tinyos-2.x.git] / tos / system / tos.h

diff --git a/tos/system/tos.h b/tos/system/tos.h
index 9b9a17dbed06bbb3b3a4a542f1248132d1e18488..ec49a208ff0ca21128e40fec961b742e75d031a7 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 };
@@ -27,9 +30,11 @@ uint16_t TOS_NODE_ID = 1;
    transfer in interfaces. See TEP 3 for more discussion. */
 #define PASS
 
+#ifdef NESC
 struct @atmostonce { };
 struct @atleastonce { };
 struct @exactlyonce { };
+#endif
 
 /* This platform_bootstrap macro exists in accordance with TEP
    107. A platform may override this through a platform.h file. */