Changeset d61c3a7 in mainline for uspace/lib/c/include/fibril_synch.h

Timestamp:

2011-05-15T14:44:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8d308b9

Parents:

010be476 (diff), e0f52bf (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:

Merge mainline changes.

File:

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

uspace/lib/c/include/fibril_synch.h

@@ -36 +36 @@
 #define LIBC_FIBRIL_SYNCH_H_
 
-#include <async.h>
 #include <fibril.h>
 #include <adt/list.h>
 #include <libarch/tls.h>
 #include <sys/time.h>
+#include <bool.h>
 
 typedef struct {
-        fibril_owner_info_t oi;         /* Keep this the first thing. */
+        fibril_owner_info_t oi;  /**< Keep this the first thing. */
         int counter;
         link_t waiters;
@@ -64 +64 @@
 
 typedef struct {
-        fibril_owner_info_t oi; /* Keep this the first thing. */
+        fibril_owner_info_t oi;  /**< Keep this the first thing. */
         unsigned writers;
         unsigned readers;