Index: uspace/lib/c/include/fibril_synch.h
===================================================================
--- uspace/lib/c/include/fibril_synch.h	(revision db6c33288adb2031e2409192c025858dce2caf7d)
+++ uspace/lib/c/include/fibril_synch.h	(revision e9460aab031540aa6d1556c9d923416297500cec)
@@ -47,6 +47,6 @@
 } fibril_mutex_t;
 
-#define FIBRIL_MUTEX_INITIALIZE(name) \
-	fibril_mutex_t name = {	\
+#define FIBRIL_MUTEX_INITIALIZER(name) \
+	{ \
 		.counter = 1, \
 		.waiters = { \
@@ -55,4 +55,7 @@
 		} \
 	}
+	
+#define FIBRIL_MUTEX_INITIALIZE(name) \
+	fibril_mutex_t name = FIBRIL_MUTEX_INITIALIZER(name) 
 
 typedef struct {
@@ -62,6 +65,6 @@
 } fibril_rwlock_t;
 
-#define FIBRIL_RWLOCK_INITIALIZE(name) \
-	fibril_rwlock_t name = { \
+#define FIBRIL_RWLOCK_INITIALIZER(name) \
+	{ \
 		.readers = 0, \
 		.writers = 0, \
@@ -72,10 +75,13 @@
 	}
 
+#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,4 +89,7 @@
 		} \
 	}
+
+#define FIBRIL_CONDVAR_INITIALIZE(name) \
+	fibril_condvar_t name = FIBRIL_CONDVAR_INITIALIZER(name)
 
 extern void fibril_mutex_initialize(fibril_mutex_t *);