@@ -14,162 +14,17 @@
  * file.
  */
 
 #import "threading.h"
 
-bool
-of_thread_new(of_thread_t *thread, id (*function)(id), id data)
-{
-#if defined(OF_HAVE_PTHREADS)
-	return (pthread_create(thread, NULL, (void*(*)(void*))function,
-	    (__bridge void*)data) == 0);
-#elif defined(_WIN32)
-	*thread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)function,
-	    (__bridge void*)data, 0, NULL);
-
-	return (thread != NULL);
-#else
-# error of_thread_new not implemented!
-#endif
-}
-
-bool
-of_thread_join(of_thread_t thread)
-{
-#if defined(OF_HAVE_PTHREADS)
-	void *ret;
-
-	if (pthread_join(thread, &ret) != 0)
-		return false;
-
-# ifdef PTHREAD_CANCELED
-	return (ret != PTHREAD_CANCELED);
-# else
-	return true;
-# endif
-#elif defined(_WIN32)
-	if (WaitForSingleObject(thread, INFINITE))
-		return false;
-
-	CloseHandle(thread);
-
-	return true;
-#else
-# error of_thread_join not implemented!
-#endif
-}
-
-bool
-of_thread_detach(of_thread_t thread)
-{
-#if defined(OF_HAVE_PTHREADS)
-	return !pthread_detach(thread);
-#elif defined(_WIN32)
-	/* FIXME */
-	return true;
-#else
-# error of_thread_detach not implemented!
-#endif
-}
-
-void OF_NO_RETURN
-of_thread_exit(void)
-{
-#if defined(OF_HAVE_PTHREADS)
-	pthread_exit(NULL);
-#elif defined(_WIN32)
-	ExitThread(0);
-#else
-# error of_thread_exit not implemented!
-#endif
-	OF_UNREACHABLE
-}
-
-void
-of_once(of_once_t *control, void (*func)(void))
-{
-#if defined(OF_HAVE_PTHREADS)
-	pthread_once(control, func);
-#elif defined(_WIN32)
-	switch (InterlockedCompareExchange(control, 1, 0)) {
-	case 0:
-		func();
-		InterlockedIncrement(control);
-		break;
-	case 1:
-		while (*control == 1)
-			Sleep(0);
-		break;
-	}
-#else
-# error of_once not implemented!
-#endif
-}
-
-bool
-of_mutex_new(of_mutex_t *mutex)
-{
-#if defined(OF_HAVE_PTHREADS)
-	return !pthread_mutex_init(mutex, NULL);
-#elif defined(_WIN32)
-	InitializeCriticalSection(mutex);
-	return true;
-#else
-# error of_mutex_new not implemented!
-#endif
-}
-
-bool
-of_mutex_lock(of_mutex_t *mutex)
-{
-#if defined(OF_HAVE_PTHREADS)
-	return !pthread_mutex_lock(mutex);
-#elif defined(_WIN32)
-	EnterCriticalSection(mutex);
-	return true;
-#else
-# error of_mutex_lock not implemented!
-#endif
-}
-
-bool
-of_mutex_trylock(of_mutex_t *mutex)
-{
-#if defined(OF_HAVE_PTHREADS)
-	return !pthread_mutex_trylock(mutex);
-#elif defined(_WIN32)
-	return TryEnterCriticalSection(mutex);
-#else
-# error of_mutex_trylock not implemented!
-#endif
-}
-
-bool
-of_mutex_unlock(of_mutex_t *mutex)
-{
-#if defined(OF_HAVE_PTHREADS)
-	return (pthread_mutex_unlock(mutex) == 0);
-#elif defined(_WIN32)
-	LeaveCriticalSection(mutex);
-	return true;
-#else
-# error of_mutex_unlock not implemented!
-#endif
-}
-
-bool
-of_mutex_free(of_mutex_t *mutex)
-{
-#if defined(OF_HAVE_PTHREADS)
-	return !pthread_mutex_destroy(mutex);
-#elif defined(_WIN32)
-	DeleteCriticalSection(mutex);
-	return true;
-#else
-# error of_mutex_free not implemented!
-#endif
-}
+#if defined(OF_HAVE_PTHREADS)
+# include "threading_pthread.m"
+#elif defined(_WIN32)
+# include "threading_winapi.m"
+#else
+# error No threads available!
+#endif
 
 bool
 of_rmutex_new(of_rmutex_t *rmutex)
 {
 #ifdef OF_HAVE_RECURSIVE_PTHREAD_MUTEXES
@@ -291,128 +146,5 @@
 		return false;
 
 	return true;
 #endif
 }
-
-bool
-of_condition_new(of_condition_t *condition)
-{
-#if defined(OF_HAVE_PTHREADS)
-	return (pthread_cond_init(condition, NULL) == 0);
-#elif defined(_WIN32)
-	condition->count = 0;
-
-	if ((condition->event = CreateEvent(NULL, FALSE, 0, NULL)) == NULL)
-		return false;
-
-	return true;
-#else
-# error of_condition_new not implemented!
-#endif
-}
-
-bool
-of_condition_signal(of_condition_t *condition)
-{
-#if defined(OF_HAVE_PTHREADS)
-	return !pthread_cond_signal(condition);
-#elif defined(_WIN32)
-	return SetEvent(condition->event);
-#else
-# error of_condition_signal not implemented!
-#endif
-}
-
-bool
-of_condition_broadcast(of_condition_t *condition)
-{
-#if defined(OF_HAVE_PTHREADS)
-	return !pthread_cond_broadcast(condition);
-#elif defined(_WIN32)
-	int i;
-
-	for (i = 0; i < condition->count; i++)
-		if (!SetEvent(condition->event))
-			return false;
-
-	return true;
-#else
-# error of_condition_broadcast not implemented!
-#endif
-}
-
-bool
-of_condition_wait(of_condition_t *condition, of_mutex_t *mutex)
-{
-#if defined(OF_HAVE_PTHREADS)
-	return !pthread_cond_wait(condition, mutex);
-#elif defined(_WIN32)
-	if (!of_mutex_unlock(mutex))
-		return false;
-
-	of_atomic_int_inc(&condition->count);
-
-	if (WaitForSingleObject(condition->event, INFINITE) != WAIT_OBJECT_0) {
-		of_mutex_lock(mutex);
-		return false;
-	}
-
-	of_atomic_int_dec(&condition->count);
-
-	if (!of_mutex_lock(mutex))
-		return false;
-
-	return true;
-#else
-# error of_condition_wait not implemented!
-#endif
-}
-
-bool
-of_condition_timed_wait(of_condition_t *condition, of_mutex_t *mutex,
-    of_time_interval_t timeout)
-{
-#if defined(OF_HAVE_PTHREADS)
-	struct timespec ts;
-
-	ts.tv_sec = (time_t)timeout;
-	ts.tv_nsec = lrint((timeout - ts.tv_sec) * 1000000000);
-
-	return !pthread_cond_timedwait(condition, mutex, &ts);
-#elif defined(_WIN32)
-	if (!of_mutex_unlock(mutex))
-		return false;
-
-	of_atomic_int_inc(&condition->count);
-
-	if (WaitForSingleObject(condition->event,
-	    timeout * 1000) != WAIT_OBJECT_0) {
-		of_mutex_lock(mutex);
-		return false;
-	}
-
-	of_atomic_int_dec(&condition->count);
-
-	if (!of_mutex_lock(mutex))
-		return false;
-
-	return true;
-#else
-# error of_condition_timed_wait not implemented!
-#endif
-}
-
-bool
-of_condition_free(of_condition_t *condition)
-{
-#if defined(OF_HAVE_PTHREADS)
-	return !pthread_cond_destroy(condition);
-#elif defined(_WIN32)
-	if (condition->count)
-		return false;
-
-	return CloseHandle(condition->event);
-#else
-# error of_condition_free not implemented!
-#endif
-}