@@ -13,39 +13,39 @@
  * file.
  */
 
 #include "config.h"
 
-#import "condition.h"
+#import "OFPlainCondition.h"
 
 int
-of_condition_new(of_condition_t *condition)
+OFPlainConditionNew(OFPlainCondition *condition)
 {
 	return pthread_cond_init(condition, NULL);
 }
 
 int
-of_condition_signal(of_condition_t *condition)
+OFPlainConditionSignal(OFPlainCondition *condition)
 {
 	return pthread_cond_signal(condition);
 }
 
 int
-of_condition_broadcast(of_condition_t *condition)
+OFPlainConditionBroadcast(OFPlainCondition *condition)
 {
 	return pthread_cond_broadcast(condition);
 }
 
 int
-of_condition_wait(of_condition_t *condition, of_mutex_t *mutex)
+OFPlainConditionWait(OFPlainCondition *condition, OFPlainMutex *mutex)
 {
 	return pthread_cond_wait(condition, mutex);
 }
 
 int
-of_condition_timed_wait(of_condition_t *condition, of_mutex_t *mutex,
-    of_time_interval_t timeout)
+OFPlainConditionTimedWait(OFPlainCondition *condition, OFPlainMutex *mutex,
+    OFTimeInterval timeout)
 {
 	struct timespec ts;
 
 	ts.tv_sec = (time_t)timeout;
 	ts.tv_nsec = (long)((timeout - ts.tv_sec) * 1000000000);
@@ -52,9 +52,9 @@
 
 	return pthread_cond_timedwait(condition, mutex, &ts);
 }
 
 int
-of_condition_free(of_condition_t *condition)
+OFPlainConditionFree(OFPlainCondition *condition)
 {
 	return pthread_cond_destroy(condition);
 }