Changeset d5a89a3 in mainline for uspace/lib/c/include/fibril.h

Timestamp:

2019-02-11T22:31:04Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (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:

merging with upstream/master

File:

• uspace/lib/c/include/fibril.h (modified) (3 diffs)

uspace/lib/c/include/fibril.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_FIBRIL_H_
-#define LIBC_FIBRIL_H_
+#ifndef _LIBC_FIBRIL_H_
+#define _LIBC_FIBRIL_H_
 
 #include <types/common.h>
 #include <time.h>
 #include <_bits/__noreturn.h>
-#include <ipc/common.h>
 
 typedef struct fibril fibril_t;
@@ -49 +48 @@
 typedef fibril_t *fid_t;
 
+#ifndef __cplusplus
 /** Fibril-local variable specifier */
 #define fibril_local __thread
-
-#define FIBRIL_DFLT_STK_SIZE    0
+#endif
 
 extern fid_t fibril_create_generic(errno_t (*)(void *), void *, size_t);
+extern fid_t fibril_create(errno_t (*)(void *), void *);
 extern void fibril_destroy(fid_t);
 extern void fibril_add_ready(fid_t);
@@ -68 +68 @@
 extern void fibril_detach(fid_t fid);
 
-static inline fid_t fibril_create(errno_t (*func)(void *), void *arg)
-{
-        return fibril_create_generic(func, arg, FIBRIL_DFLT_STK_SIZE);
-}
-
 extern void fibril_start(fid_t);
 extern __noreturn void fibril_exit(long);