@@ -41,16 +41,16 @@
 #elif defined(OF_HAVE_ATOMIC_OPS)
 	/* Avoid atomic operations in case it's already done. */
 	if (*control == 2)
 		return;
 
-	if (of_atomic_int_cmpswap(control, 0, 1)) {
+	if (OFAtomicIntCompareAndSwap(control, 0, 1)) {
 		func();
 
 		of_memory_barrier();
 
-		of_atomic_int_inc(control);
+		OFAtomicIntIncrease(control);
 	} else
 		while (*control == 1)
 			OFYieldThread();
 #elif defined(OF_AMIGAOS)
 	bool run = false;