# define lock_grab(x) pthread_mutex_lock(x)
# define lock_release(x) pthread_mutex_unlock(x)
# define lock_destroy(x) pthread_mutex_destroy(x)
-# define cond_destroy(x) pthread_cond_destroy(x);
-# define cond_signal(x) pthread_cond_signal(x);
+# define cond_destroy(x) pthread_cond_destroy(x)
+# define cond_init(x) pthread_cond_init(x, NULL)
+# define cond_signal(x) pthread_cond_signal(x)
+# define cond_wait(x,y) pthread_cond_wait(x,y)
#else
# define lock_grab(x) EnterCriticalSection(x)
# define lock_release(x) LeaveCriticalSection(x)
# define lock_destroy(x) DeleteCriticalSection(x)
-# define cond_destroy(x) CloseHandle(*x);
-# define cond_signal(x) SetEvent(*x);
-
+# define cond_init(x) { *x = CreateEvent(0, FALSE, FALSE, 0); }
+# define cond_destroy(x) CloseHandle(*x)
+# define cond_signal(x) SetEvent(*x)
+# define cond_wait(x,y) { lock_release(y); WaitForSingleObject(*x, INFINITE); lock_grab(y); }
#endif
#endif // !defined(LOCK_H_INCLUDED)