X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Ftypes%2FTinyError.h;h=b9767ae6580d1366c185991b1d6ecb8c82d683a0;hb=4fb956e3bddd9f271197449e3b7029d23f602040;hp=c039ac8d8497a79184f5cf473690c32ae6c83b52;hpb=f44d6d35052f388b3dd92252f299df85a96d3fac;p=tinyos-2.x.git diff --git a/tos/types/TinyError.h b/tos/types/TinyError.h index c039ac8d..b9767ae6 100644 --- 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.