Changeset fb4d788 in mainline for uspace/lib/c/include/fibril_synch.h

Timestamp:

2015-07-28T11:28:14Z (9 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6accc5cf

Parents:

df2bce3 (diff), 47726b5e (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 from the mainline

File:

• uspace/lib/c/include/fibril_synch.h (modified) (1 diff)

uspace/lib/c/include/fibril_synch.h

@@ -135 +135 @@
         fid_t fibril;
         fibril_timer_state_t state;
-        bool handler_running;
+        /** FID of fibril executing handler or 0 if handler is not running */
+        fid_t handler_fid;
 
         suseconds_t delay;