Index: tests/concurrent/signal/block.cfa
===================================================================
--- tests/concurrent/signal/block.cfa	(revision 107b01a853d2fa7848b6015136777f62881c1779)
+++ tests/concurrent/signal/block.cfa	(revision 9867cdb2b3e0aa40bc00a118a6453ff976bf5afd)
@@ -33,6 +33,6 @@
 
 monitor global_data_t {
-	thread_desc * last_thread;
-	thread_desc * last_signaller;
+	$thread * last_thread;
+	$thread * last_signaller;
 };
 
@@ -82,5 +82,5 @@
 	if( !is_empty( cond ) ) {
 
-		thread_desc * next = front( cond );
+		$thread * next = front( cond );
 
 		if( ! signal_block( cond ) ) {