Changeset 231b3fd in mainline for uspace/lib/c/generic/async/server.c


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/generic/async/server.c

    re2625b1a r231b3fd  
    110110#include <assert.h>
    111111#include <errno.h>
    112 #include <sys/time.h>
     112#include <time.h>
    113113#include <stdbool.h>
    114114#include <stdlib.h>
     
    916916 *
    917917 */
    918 bool async_get_call_timeout(ipc_call_t *call, suseconds_t usecs)
     918bool async_get_call_timeout(ipc_call_t *call, usec_t usecs)
    919919{
    920920        assert(call);
    921921        assert(fibril_connection);
    922922
    923         struct timeval tv;
    924         struct timeval *expires = NULL;
     923        struct timespec ts;
     924        struct timespec *expires = NULL;
    925925        if (usecs) {
    926                 getuptime(&tv);
    927                 tv_add_diff(&tv, usecs);
    928                 expires = &tv;
     926                getuptime(&ts);
     927                ts_add_diff(&ts, USEC2NSEC(usecs));
     928                expires = &ts;
    929929        }
    930930
Note: See TracChangeset for help on using the changeset viewer.