Index: libcfa/src/concurrency/clib/cfathread.cfa
===================================================================
--- libcfa/src/concurrency/clib/cfathread.cfa	(revision b4b63e8f7b73b2f77b154650ba47a2df216a9713)
+++ libcfa/src/concurrency/clib/cfathread.cfa	(revision 9dc3eb21aaa56f0f92f0c321820e671a30ea502f)
@@ -34,5 +34,5 @@
 extern "C" {
 	//--------------------
-	// Basic thread management
+	// Basic thread managenemt
 	CRunner * cfathread_create( void (*main)( CRunner * ) ) {
 		return new( main );
@@ -44,9 +44,9 @@
 
 	void cfathread_park( void ) {
-		park();
+		park( __cfaabi_dbg_ctx );
 	}
 
 	void cfathread_unpark( CRunner * thrd ) {
-		unpark( *thrd );
+		unpark( *thrd __cfaabi_dbg_ctx2 );
 	}
 
Index: libcfa/src/concurrency/clib/cfathread.h
===================================================================
--- libcfa/src/concurrency/clib/cfathread.h	(revision b4b63e8f7b73b2f77b154650ba47a2df216a9713)
+++ libcfa/src/concurrency/clib/cfathread.h	(revision 9dc3eb21aaa56f0f92f0c321820e671a30ea502f)
@@ -17,5 +17,5 @@
 #include "invoke.h"
 
-#if defined(__cforall) || defined(__cplusplus)
+#if defined(__cforall) || defined(__cpluplus)
 extern "C" {
 #endif
@@ -39,5 +39,5 @@
 
 
-#if defined(__cforall) || defined(__cplusplus)
+#if defined(__cforall) || defined(__cpluplus)
 }
 #endif