From 28a707371ff9414a1394c52de182ac295eaa00d7 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Tue, 13 Mar 2012 12:58:35 +0100 Subject: MSVC build fixed; xs_utils.h includes removed Signed-off-by: Martin Sustrik --- tests/testutil.hpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tests/testutil.hpp') 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 #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); } -- cgit v1.2.3