Changeset 231b3fd in mainline for uspace/lib/c/include/io/con_srv.h

Timestamp:

2018-08-25T21:35:26Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

e2625b1a (diff), 3c45353 (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.

git-author:

Jakub Jermář <jakub@…> (2018-08-25 21:35:26)

git-committer:

GitHub <noreply@…> (2018-08-25 21:35:26)

Message:

Merge 3c453534a2b093c8039d8e8059b923c71f3492a3 into e2625b1a1e5a2895b86f0e39c2d70a39e49e042a

File:

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

uspace/lib/c/include/io/con_srv.h

@@ -45 +45 @@
 #include <io/style.h>
 #include <stdbool.h>
-#include <sys/time.h>
+#include <time.h>
 #include <stddef.h>
 
@@ -55 +55 @@
         void *sarg;
         /** Period to check for abort */
-        suseconds_t abort_timeout;
+        usec_t abort_timeout;
         bool aborted;
 } con_srvs_t;