diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2012-03-13 12:58:35 +0100 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2012-03-13 12:58:35 +0100 |
commit | 28a707371ff9414a1394c52de182ac295eaa00d7 (patch) | |
tree | 44378333e1c1ac82c8f960dfb8c65ca85fed0b7a /tests/testutil.hpp | |
parent | 4a444c0bfca2ef61de6f22cee79104990493c9ae (diff) |
MSVC build fixed; xs_utils.h includes removed
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'tests/testutil.hpp')
-rw-r--r-- | tests/testutil.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
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); } |