Changeset 58775d30 in mainline for uspace/lib/c/generic/fibril_synch.c

Timestamp:

2015-03-16T16:07:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2003739

Parents:

6069061 (diff), 795e2bf (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:

Mainline changes

File:

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

uspace/lib/c/generic/fibril_synch.c

@@ -380 +380 @@
         if (timeout) {
                 getuptime(&wdata.to_event.expires);
-                tv_add(&wdata.to_event.expires, timeout);
+                tv_add_diff(&wdata.to_event.expires, timeout);
                 async_insert_timeout(&wdata);
         }