Update to allow header files to be processed via standard gcc and not have to run...

diff --git a/tos/system/tos.h b/tos/system/tos.h
index 25ec7569946c10a3f1c59c918d183f5f3575b2c3..ec49a208ff0ca21128e40fec961b742e75d031a7 100644 (file)
--- a/tos/system/tos.h
+++ b/tos/system/tos.h
@@ -30,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. */

diff --git a/tos/types/TinyError.h b/tos/types/TinyError.h
index 02249bc2db5ca56d6f537598becec9de4dbd50e5..c2ed2bfab8c9b13f2ed60d9465def147a1f56e34 100644 (file)
--- a/tos/types/TinyError.h
+++ b/tos/types/TinyError.h
@@ -31,6 +31,12 @@
 #ifndef TINY_ERROR_H_INCLUDED
 #define TINY_ERROR_H_INCLUDED
 
+#ifdef NESC
+#define NESC_COMBINE(x) @combine(x)
+#else
+#define NESC_COMBINE(x)
+#endif
+
 enum {
   SUCCESS        = 0,          
   FAIL           = 1,           // Generic condition: backwards compatible
@@ -44,7 +50,7 @@ enum {
   EALREADY       = 9,           // The device state you are requesting is already set
 };
 
-typedef uint8_t error_t @combine("ecombine");
+typedef uint8_t error_t NESC_COMBINE("ecombine");
 
 error_t ecombine(error_t r1, error_t r2)
 /* Returns: r1 if r1 == r2, FAIL otherwise. This is the standard error