Changeset 241f1985 in mainline for uspace/lib/c/generic/private

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

Location:

uspace/lib/c/generic/private

Files:

• async.h (modified) (2 diffs)
• taskman.h (modified) (1 diff)

uspace/lib/c/generic/private/async.h

@@ -42 +42 @@
 #include <time.h>
 #include <stdbool.h>
+#include <stdatomic.h>
 
 /** Session data */
@@ -106 +107 @@
 
 extern void async_reply_received(ipc_call_t *);
-extern async_sess_t *create_session(int, exch_mgmt_t,
+extern async_sess_t *create_session(cap_phone_handle_t, exch_mgmt_t,
         sysarg_t, sysarg_t, sysarg_t);
-extern int async_session_phone(async_sess_t *);
+extern cap_phone_handle_t async_session_phone(async_sess_t *);
 
 #endif

uspace/lib/c/generic/private/taskman.h

@@ -36 +36 @@
 #define LIBC_PRIVATE_TASKMAN_H_
 
-#include <async.h>
+#include "async.h"
 
 extern async_sess_t *session_taskman;