Index: src/libcfa/bits/defs.h
===================================================================
--- src/libcfa/bits/defs.h	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/libcfa/bits/defs.h	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -1,16 +1,16 @@
-//
+// 
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-//
-// bits/defs.h --
-//
+// 
+// defs.h -- 
+// 
 // Author           : Thierry Delisle
-// Created On       : Thu Nov 09 13:24:10 2017
-// Last Modified By :
-// Last Modified On :
-// Update Count     :
-//
+// Created On       : Thu Nov  9 13:24:10 2017
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jan  2 09:17:06 2018
+// Update Count     : 2
+// 
 
 #pragma once
@@ -20,6 +20,6 @@
 #include <stdint.h>
 
-#define unlikely(x)    __builtin_expect(!!(x), 0)
-#define likely  (x)    __builtin_expect(!!(x), 1)
+#define likely(x)   __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
 #define thread_local _Thread_local
 
Index: src/libcfa/stdlib
===================================================================
--- src/libcfa/stdlib	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/libcfa/stdlib	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -10,6 +10,6 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan  1 17:35:43 2018
-// Update Count     : 291
+// Last Modified On : Tue Jan  2 12:21:04 2018
+// Update Count     : 292
 //
 
@@ -265,5 +265,5 @@
 //---------------------------------------
 
-void random_seed( long int s );
+extern "C" { void srandom( unsigned int seed ); }		// override C version
 char random( void );
 char random( char u );
@@ -275,5 +275,5 @@
 unsigned int random( unsigned int u );
 unsigned int random( unsigned int l, unsigned int u );
-extern "C" { long int random( void ); }
+extern "C" { long int random( void ); }					// override C version
 long int random( long int u );
 long int random( long int l, long int u );
Index: src/libcfa/stdlib.c
===================================================================
--- src/libcfa/stdlib.c	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/libcfa/stdlib.c	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -10,6 +10,6 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan  1 19:03:16 2018
-// Update Count     : 437
+// Last Modified On : Tue Jan  2 12:20:32 2018
+// Update Count     : 441
 //
 
@@ -257,5 +257,5 @@
 //---------------------------------------
 
-void random_seed( long int s ) { srand48( s ); srandom( s ); } // call srandom to harmonize with C-lib random
+extern "C" { void srandom( unsigned int seed ) { srand48( seed ); } } // override C version
 char random( void ) { return (unsigned long int)random(); }
 char random( char u ) { return random( (unsigned long int)u ); }
@@ -267,5 +267,5 @@
 unsigned int random( unsigned int u ) { return random( (unsigned long int)u ); }
 unsigned int random( unsigned int l, unsigned int u ) { return random( (unsigned long int)l, (unsigned long int)u ); }
-//extern "C" { long int random() { return mrand48(); } }
+extern "C" { long int random( void ) { return mrand48(); } } // override C version
 long int random( long int u ) { if ( u < 0 ) return random( u, 0 ); else return random( 0, u ); }
 long int random( long int l, long int u ) { assert( l < u ); return lrand48() % (u - l) + l; }
Index: src/tests/.expect/random.txt
===================================================================
--- src/tests/.expect/random.txt	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/tests/.expect/random.txt	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -2,19 +2,19 @@
 =
 V
-2005783408
-2
+-911259971
 6
-861904956
-7
-10
-630915564
-8
-5
-697339851
-5
-19
-0.61653
-0.623932379138292
-0.677254+0.678107i
-0.298107334760999+0.951550630916653i
-0.724141628787954517+0.188154303303139869i
+-4
+1232105397
+0
+18
+-914096085
+1
+15
+2077092859
+1
+11
+0.677254
+0.678106775246139
+0.298107+0.951551i
+0.724141628787955+0.18815430330314i
+0.358747528448063235+0.27913860468074958i
Index: src/tests/concurrent/examples/boundedBuffer.c
===================================================================
--- src/tests/concurrent/examples/boundedBuffer.c	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/tests/concurrent/examples/boundedBuffer.c	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -8,6 +8,6 @@
 // Created On       : Mon Oct 30 12:45:13 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec 14 21:28:52 2017
-// Update Count     : 32
+// Last Modified On : Tue Jan  2 12:18:18 2018
+// Update Count     : 33
 //
 
@@ -91,6 +91,6 @@
 	processor p;
 
-	//random_seed( getpid() );
-	random_seed( 1003 );
+	//srandom( getpid() );
+	srandom( 1003 );
 
 	for ( i = 0; i < Cons; i += 1 ) {			// create consumers
Index: src/tests/concurrent/examples/datingService.c
===================================================================
--- src/tests/concurrent/examples/datingService.c	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/tests/concurrent/examples/datingService.c	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -8,6 +8,6 @@
 // Created On       : Mon Oct 30 12:56:20 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec  6 12:19:19 2017
-// Update Count     : 21
+// Last Modified On : Tue Jan  2 12:19:01 2018
+// Update Count     : 22
 //
 
@@ -91,5 +91,5 @@
 	Boy  *boys[NoOfPairs];
 
-	random_seed( /*getpid()*/ 103 );
+	srandom( /*getpid()*/ 103 );
 
 	for ( unsigned int i = 0; i < NoOfPairs; i += 1 ) {
Index: src/tests/concurrent/signal/barge.c
===================================================================
--- src/tests/concurrent/signal/barge.c	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/tests/concurrent/signal/barge.c	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -109,5 +109,5 @@
 
 int main(int argc, char* argv[]) {
-	random_seed(0);
+	srandom(0);
 	processor p;
 	{
Index: src/tests/concurrent/signal/block.c
===================================================================
--- src/tests/concurrent/signal/block.c	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/tests/concurrent/signal/block.c	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -118,5 +118,5 @@
 
 int main(int argc, char* argv[]) {
-	random_seed( time( NULL ) );
+	srandom( time( NULL ) );
 	done = false;
 	processor p;
Index: src/tests/concurrent/signal/disjoint.c
===================================================================
--- src/tests/concurrent/signal/disjoint.c	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/tests/concurrent/signal/disjoint.c	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -109,5 +109,5 @@
 // Main loop
 int main(int argc, char* argv[]) {
-	random_seed( time( NULL ) );
+	srandom( time( NULL ) );
 	all_done = false;
 	processor p;
Index: src/tests/concurrent/signal/wait.c
===================================================================
--- src/tests/concurrent/signal/wait.c	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/tests/concurrent/signal/wait.c	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -127,5 +127,5 @@
 // Main
 int main(int argc, char* argv[]) {
-	random_seed( time( NULL ) );
+	srandom( time( NULL ) );
 	waiter_left = 4;
 	processor p[2];
Index: src/tests/concurrent/waitfor/recurse.c
===================================================================
--- src/tests/concurrent/waitfor/recurse.c	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/tests/concurrent/waitfor/recurse.c	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -131,5 +131,5 @@
 
 int main() {
-	random_seed( time(NULL) );
+	srandom( time(NULL) );
 	sout | "Starting" | endl;
 	{
Index: src/tests/concurrent/waitfor/simple.c
===================================================================
--- src/tests/concurrent/waitfor/simple.c	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/tests/concurrent/waitfor/simple.c	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -74,5 +74,5 @@
 int main(int argc, char* argv[]) {
 	done = false;
-	random_seed( time( NULL ) );
+	srandom( time( NULL ) );
 	printf("%p\n", &globalA);
 	sout | "Starting" | endl;
Index: src/tests/concurrent/waitfor/when.c
===================================================================
--- src/tests/concurrent/waitfor/when.c	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/tests/concurrent/waitfor/when.c	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -77,5 +77,5 @@
 
 int main() {
-	random_seed( time(NULL) );
+	srandom( time(NULL) );
 	sout | "Starting" | endl;
 	{
Index: src/tests/coroutine/prodcons.c
===================================================================
--- src/tests/coroutine/prodcons.c	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/tests/coroutine/prodcons.c	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -10,6 +10,6 @@
 // Created On       : Mon Sep 18 12:23:39 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec  5 22:40:55 2017
-// Update Count     : 46
+// Last Modified On : Tue Jan  2 12:17:01 2018
+// Update Count     : 47
 // 
 
@@ -90,5 +90,5 @@
 	Prod prod;
 	Cons cons = { prod };
-	random_seed( /* getpid() */ 103 );					// fixed seed for testing
+	srandom( /* getpid() */ 103 );						// fixed seed for testing
 	start( prod, 5, cons );
 	sout | "main stops" | endl;
Index: src/tests/random.c
===================================================================
--- src/tests/random.c	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
+++ src/tests/random.c	(revision b3048d49aeb2ea2dd5d01939e5b683c1307b07d1)
@@ -10,6 +10,6 @@
 // Created On       : Tue Jul  5 21:29:30 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Dec 24 07:48:23 2017
-// Update Count     : 18
+// Last Modified On : Tue Jan  2 12:19:34 2018
+// Update Count     : 19
 // 
 
@@ -19,6 +19,6 @@
 
 int main() {
-	// random_seed( getpid() );								// set random seed
-	random_seed( 1003 );								// fixed seed for repeatable tests
+	// srandom( getpid() );								// set random seed
+	srandom( 1003 );									// fixed seed for repeatable tests
 
 	// test polymorphic calls to random and stream