MSVC build fixed; xs_utils.h includes removed

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

2 files changed, 4 insertions, 5 deletions

diff --git a/tests/tests.cpp b/tests/tests.cpp
index 818cdc1..ca1b2eb 100644
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@@ -139,7 +139,7 @@ int main ()
     assert (rc == 0);
 
     fprintf (stderr, "SUCCESS\n");
-    xs_sleep (1);
+    sleep (1);
 
     return 0;
 }
diff --git a/tests/testutil.hpp b/tests/testutil.hpp
index d3452e3..4e0287a 100644
--- a/tests/testutil.hpp
+++ b/tests/testutil.hpp
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 
 #include "../include/xs.h"
-#include "../include/xs_utils.h"
 #include "../src/platform.hpp"
 
 #if !defined XS_HAVE_WINDOWS
@@ -74,7 +73,7 @@ void *thread_create (void (*fn_) (void *arg_), void *arg_)
     arg->arg = arg_;
     arg->handle = (HANDLE) _beginthreadex (NULL, 0,
         &::thread_routine, (void*) arg, 0 , NULL);
-    win_assert (arg->handle != NULL);
+    assert (arg->handle != NULL);
     return (void*) arg;
 }
 
@@ -82,9 +81,9 @@ void thread_join (void *thread_)
 {
     arg_t *arg = (arg_t*) thread_;
     DWORD rc = WaitForSingleObject (arg->handle, INFINITE);
-    win_assert (rc != WAIT_FAILED);
+    assert (rc != WAIT_FAILED);
     BOOL rc2 = CloseHandle (arg->handle);
-    win_assert (rc2 != 0);
+    assert (rc2 != 0);
     free (arg);
 }