Changeset 055a68a in mainline for uspace/lib/c/generic/io/console.c

Timestamp:

2015-04-23T23:47:40Z (10 years ago)

Author:

Michal Koutný <xm.koutny+hos@…>

Branches:

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

Children:

a18a8b9

Parents:

acb8766e (diff), dcba819 (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

File:

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

uspace/lib/c/generic/io/console.c

@@ -259 +259 @@
         struct timeval t1;
         gettimeofday(&t1, NULL);
-        *timeout -= tv_sub(&t1, &t0);
+        *timeout -= tv_sub_diff(&t1, &t0);
         
         return true;