Index: benchmark/io/http/channel.hfa
===================================================================
--- benchmark/io/http/channel.hfa	(revision 31be464d5638b82a5f5521d37bad5005223dcb8c)
+++ benchmark/io/http/channel.hfa	(revision db096858b308c3b1b737a6c444ff178d5e9a0fea)
@@ -12,6 +12,6 @@
 		int size;
 		mutex_lock lock;
-		condition_variable prods;
-		condition_variable cons;
+		cond_lock prods;
+		cond_lock cons;
 	};
 
Index: benchmark/io/http/printer.hfa
===================================================================
--- benchmark/io/http/printer.hfa	(revision 31be464d5638b82a5f5521d37bad5005223dcb8c)
+++ benchmark/io/http/printer.hfa	(revision db096858b308c3b1b737a6c444ff178d5e9a0fea)
@@ -50,5 +50,5 @@
 		acceptor_stats_t accpt;
 	} stats;
-	condition_variable(fast_block_lock) var;
+	cond_lock(fast_block_lock) var;
 	ServerCluster * cl;
 };