Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tosthreads / interfaces / Thread.nc

diff --git a/tos/lib/tosthreads/interfaces/Thread.nc b/tos/lib/tosthreads/interfaces/Thread.nc
index 15b93f6c1257740a52f8107adb8ee64507ff9b7b..0fc2f4602fbd70a187d791c6abc1874ee6059bfc 100644 (file)
--- a/tos/lib/tosthreads/interfaces/Thread.nc
+++ b/tos/lib/tosthreads/interfaces/Thread.nc
@@ -40,4 +40,5 @@ interface Thread {
   command error_t resume();
   command error_t sleep(uint32_t milli);
   event void run(void* arg);
+  command error_t join();
 }