Index: src/tests/concurrent/signal/block.c
===================================================================
--- src/tests/concurrent/signal/block.c	(revision 273cde68db4cddaf19506d2387d8c0d95059056b)
+++ src/tests/concurrent/signal/block.c	(revision 94ddedef7d98692818b37f356a5085b68c4e662f)
@@ -51,5 +51,5 @@
 //------------------------------------------------------------------------------
 void wait_op( global_data_t & mutex a, global_data_t & mutex b, unsigned i ) {
-	wait( cond, (uintptr_t)this_thread );
+    wait( cond, (uintptr_t)active_thread() );
 
 	yield( random( 10 ) );
@@ -60,5 +60,5 @@
 	}
 
-	a.last_thread = b.last_thread = this_thread;
+	a.last_thread = b.last_thread = active_thread();
 
 	yield( random( 10 ) );
@@ -76,5 +76,5 @@
 	yield( random( 10 ) );
 
-	[a.last_thread, b.last_thread, a.last_signaller, b.last_signaller] = this_thread;
+	[a.last_thread, b.last_thread, a.last_signaller, b.last_signaller] = active_thread();
 
 	if( !is_empty( cond ) ) {
@@ -106,5 +106,5 @@
 //------------------------------------------------------------------------------
 void barge_op( global_data_t & mutex a ) {
-	a.last_thread = this_thread;
+	a.last_thread = active_thread();
 }