Ignore:
Timestamp:
2019-08-31T10:45:17Z (6 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
102f641
Parents:
f92b315
git-author:
Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)
git-committer:
Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)
Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/generic/private/async.h

    rf92b315 r241f1985  
    4242#include <time.h>
    4343#include <stdbool.h>
     44#include <stdatomic.h>
    4445
    4546/** Session data */
     
    106107
    107108extern void async_reply_received(ipc_call_t *);
    108 extern async_sess_t *create_session(int, exch_mgmt_t,
     109extern async_sess_t *create_session(cap_phone_handle_t, exch_mgmt_t,
    109110        sysarg_t, sysarg_t, sysarg_t);
    110 extern int async_session_phone(async_sess_t *);
     111extern cap_phone_handle_t async_session_phone(async_sess_t *);
    111112
    112113#endif
Note: See TracChangeset for help on using the changeset viewer.