Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tosthreads / system / TosMallocC.nc

diff --git a/tos/lib/tosthreads/system/TosMallocC.nc b/tos/lib/tosthreads/system/TosMallocC.nc
index 7f811e2b212834bde22dc2f01a9372f03d72b9ba..8de2ba39feee80323f7482b146256357ac543fc4 100644 (file)
--- a/tos/lib/tosthreads/system/TosMallocC.nc
+++ b/tos/lib/tosthreads/system/TosMallocC.nc
@@ -52,7 +52,7 @@ implementation {
 
   size_t malloc_heap[MALLOC_HEAP_SIZE];
 
-  void *tos_malloc (size_t size) @C() @spontaneous()
+  void *tos_malloc (size_t size) @C() AT_SPONTANEOUS
   {
     static char once = 0;
     size_t * heap_bottom = &(malloc_heap[MALLOC_HEAP_SIZE]);
@@ -103,7 +103,7 @@ implementation {
     return NULL;
   }
 
-  void tos_free (void *p) @C() @spontaneous()
+  void tos_free (void *p) @C() AT_SPONTANEOUS
   {
     size_t *t = (size_t*)p - 1;
     MARK_FREE (t);