Changeset 6843a9c in mainline for uspace/lib/c/include/fibril.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Trivial conflicts.

File:

• uspace/lib/c/include/fibril.h (modified) (2 diffs)

uspace/lib/c/include/fibril.h

@@ -41 +41 @@
 
 #define context_set_generic(c, _pc, stack, size, ptls) \
-        (c)->pc = (sysarg_t) (_pc); \
-        (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \
-        (c)->tls = (sysarg_t) (ptls);
+        do { \
+                (c)->pc = (sysarg_t) (_pc); \
+                (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \
+                (c)->tls = (sysarg_t) (ptls); \
+        } while (0)
 
 #define FIBRIL_SERIALIZED  1
@@ -85 +87 @@
 
 extern fid_t fibril_create(int (*func)(void *), void *arg);
+extern void fibril_destroy(fid_t fid);
 extern fibril_t *fibril_setup(void);
 extern void fibril_teardown(fibril_t *f);