Many fixes for Windows. It compiles, and some tests work.

Windows is getting there.  Needs a couple of more more hours to enable
everything, especially IPC, and most of the work at this point is probably
some combination of debug and tweaking things like error handling.

2 files changed, 1 insertions, 12 deletions

diff --git a/src/core/thread.c b/src/core/thread.c
index 4a871ede..50d63521 100644
--- a/src/core/thread.c
+++ b/src/core/thread.c
@@ -38,13 +38,6 @@ nni_mtx_unlock(nni_mtx *mtx)
 
 
 int
-nni_mtx_trylock(nni_mtx *mtx)
-{
-	return (nni_plat_mtx_trylock(&mtx->mtx));
-}
-
-
-int
 nni_cv_init(nni_cv *cv, nni_mtx *mtx)
 {
 	return (nni_plat_cv_init(&cv->cv, &mtx->mtx));
@@ -85,7 +78,7 @@ nni_cv_until(nni_cv *cv, nni_time until)
 void
 nni_cv_wake(nni_cv *cv)
 {
-	return (nni_plat_cv_wake(&cv->cv));
+	nni_plat_cv_wake(&cv->cv);
 }
 
 
diff --git a/src/core/thread.h b/src/core/thread.h
index f41091a7..95794a6e 100644
--- a/src/core/thread.h
+++ b/src/core/thread.h
@@ -49,10 +49,6 @@ extern void nni_mtx_lock(nni_mtx *mtx);
 // owned by the calling thread.
 extern void nni_mtx_unlock(nni_mtx *mtx);
 
-// nni_mtx_trylock attempts to acquire the given mutex.  It returns
-// NNG_EBUSY if the mutex is locked.
-extern int nni_mtx_trylock(nni_mtx *mtx);
-
 // nni_cv_init initializes the condition variable.  The mutex supplied
 // must always be locked with the condition variable.
 extern int nni_cv_init(nni_cv *cv, nni_mtx *);