get rid of +5 for rounding, change arg name in functions in CtpInfo to match the...

[tinyos-2.x.git] / tos / types / TinyError.h

diff --git a/tos/types/TinyError.h b/tos/types/TinyError.h
index c039ac8d8497a79184f5cf473690c32ae6c83b52..b9767ae6580d1366c185991b1d6ecb8c82d683a0 100644 (file)
--- a/tos/types/TinyError.h
+++ b/tos/types/TinyError.h
@@ -55,7 +55,7 @@ enum {
 
 typedef uint8_t error_t NESC_COMBINE("ecombine");
 
-error_t ecombine(error_t r1, error_t r2)
+error_t ecombine(error_t r1, error_t r2) @safe()
 /* Returns: r1 if r1 == r2, FAIL otherwise. This is the standard error
      combination function: two successes, or two identical errors are
      preserved, while conflicting errors are represented by FAIL.