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

Timestamp:

2010-10-10T19:52:27Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

10056483

Parents:

ae972834 (diff), eb51e31 (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 from lp:~jakub/helenos/net.

This is mostly removal of the bundle build support for the networking stack as
we don't want to manually maintain both bundled and modular configurations.

File:

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

uspace/lib/c/include/fibril_synch.h

@@ -47 +47 @@
 } fibril_mutex_t;
 
-#define FIBRIL_MUTEX_INITIALIZE(name) \
-        fibril_mutex_t name = { \
+#define FIBRIL_MUTEX_INITIALIZER(name) \
+        { \
                 .counter = 1, \
                 .waiters = { \
@@ -55 +55 @@
                 } \
         }
+        
+#define FIBRIL_MUTEX_INITIALIZE(name) \
+        fibril_mutex_t name = FIBRIL_MUTEX_INITIALIZER(name) 
 
 typedef struct {
@@ -62 +65 @@
 } fibril_rwlock_t;
 
-#define FIBRIL_RWLOCK_INITIALIZE(name) \
-        fibril_rwlock_t name = { \
+#define FIBRIL_RWLOCK_INITIALIZER(name) \
+        { \
                 .readers = 0, \
                 .writers = 0, \
@@ -72 +75 @@
         }
 
+#define FIBRIL_RWLOCK_INITIALIZE(name) \
+        fibril_rwlock_t name = FIBRIL_RWLOCK_INITIALIZER(name)
+
 typedef struct {
         link_t waiters;
 } fibril_condvar_t;
 
-#define FIBRIL_CONDVAR_INITIALIZE(name) \
-        fibril_condvar_t name = { \
+#define FIBRIL_CONDVAR_INITIALIZER(name) \
+        { \
                 .waiters = { \
                         .next = &name.waiters, \
@@ -83 +89 @@
                 } \
         }
+
+#define FIBRIL_CONDVAR_INITIALIZE(name) \
+        fibril_condvar_t name = FIBRIL_CONDVAR_INITIALIZER(name)
 
 extern void fibril_mutex_initialize(fibril_mutex_t *);