Index: src/libcfa/concurrency/monitor
===================================================================
--- src/libcfa/concurrency/monitor	(revision b18830e160544a32e0d1b1ea1100232bf1c4545d)
+++ src/libcfa/concurrency/monitor	(revision a2dbad1018db72ea030403b45b0a7e85d157136e)
@@ -33,7 +33,7 @@
 	(this.signal_stack){};
 	this.recursion = 0;
-	this.acceptables = NULL;
-	this.acceptable_count = 0;
-	this.accepted_index = -1;
+	this.mask.accepted = NULL;
+	this.mask.clauses  = NULL;
+	this.mask.size     = 0;
 }
 
@@ -105,9 +105,9 @@
 
 struct __acceptable_t {
-	__monitor_group monitors;
+	__monitor_group_t monitors;
 	bool is_dtor;
 };
 
-int __waitfor_internal( unsigned short count, __acceptable_t * acceptables, int duration );
+void __waitfor_internal( const __waitfor_mask_t & mask, int duration );
 
 // Local Variables: //