diff options
| -rw-r--r-- | builds/msvc/libxs/libxs.vcxproj | 2 | ||||
| -rw-r--r-- | builds/msvc/libxs/libxs.vcxproj.filters | 6 | ||||
| -rw-r--r-- | perf/inproc_lat.cpp | 1 | ||||
| -rw-r--r-- | perf/inproc_thr.cpp | 1 | ||||
| -rw-r--r-- | perf/local_lat.cpp | 1 | ||||
| -rw-r--r-- | perf/local_thr.cpp | 1 | ||||
| -rw-r--r-- | perf/remote_lat.cpp | 1 | ||||
| -rw-r--r-- | perf/remote_thr.cpp | 1 | ||||
| -rw-r--r-- | src/xszmq.cpp | 3 | ||||
| -rw-r--r-- | tests/tests.cpp | 2 | ||||
| -rw-r--r-- | tests/testutil.hpp | 7 |
11 files changed, 5 insertions, 21 deletions
diff --git a/builds/msvc/libxs/libxs.vcxproj b/builds/msvc/libxs/libxs.vcxproj index 5f23d4e..97dc0ee 100644 --- a/builds/msvc/libxs/libxs.vcxproj +++ b/builds/msvc/libxs/libxs.vcxproj @@ -161,11 +161,9 @@ <ClCompile Include="..\..\..\src\xsub.cpp" /> <ClCompile Include="..\..\..\src\xs.cpp" /> <ClCompile Include="..\..\..\src\xszmq.cpp" /> - <ClCompile Include="..\..\..\src\xs_utils.cpp" /> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\include\xs.h" /> - <ClInclude Include="..\..\..\include\xs_utils.h" /> <ClInclude Include="..\..\..\include\zmq.h" /> <ClInclude Include="..\..\..\src\array.hpp" /> <ClInclude Include="..\..\..\src\atomic_counter.hpp" /> diff --git a/builds/msvc/libxs/libxs.vcxproj.filters b/builds/msvc/libxs/libxs.vcxproj.filters index 8765faa..8160577 100644 --- a/builds/msvc/libxs/libxs.vcxproj.filters +++ b/builds/msvc/libxs/libxs.vcxproj.filters @@ -167,9 +167,6 @@ <ClCompile Include="..\..\..\src\xs.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\xs_utils.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\monitor.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -187,9 +184,6 @@ <ClInclude Include="..\..\..\include\xs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\xs_utils.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\array.hpp"> <Filter>Header Files</Filter> </ClInclude> diff --git a/perf/inproc_lat.cpp b/perf/inproc_lat.cpp index 802c71a..fc0b76b 100644 --- a/perf/inproc_lat.cpp +++ b/perf/inproc_lat.cpp @@ -20,7 +20,6 @@ */ #include "../include/xs.h" -#include "../include/xs_utils.h" #include <stdio.h> #include <stdlib.h> diff --git a/perf/inproc_thr.cpp b/perf/inproc_thr.cpp index de4b9ad..91f1df4 100644 --- a/perf/inproc_thr.cpp +++ b/perf/inproc_thr.cpp @@ -20,7 +20,6 @@ */ #include "../include/xs.h" -#include "../include/xs_utils.h" #include <stdio.h> #include <stdlib.h> diff --git a/perf/local_lat.cpp b/perf/local_lat.cpp index 86adb2f..3dd1c8c 100644 --- a/perf/local_lat.cpp +++ b/perf/local_lat.cpp @@ -20,7 +20,6 @@ */ #include "../include/xs.h" -#include "../include/xs_utils.h" #include <stdio.h> #include <stdlib.h> diff --git a/perf/local_thr.cpp b/perf/local_thr.cpp index 78c8930..40fdbec 100644 --- a/perf/local_thr.cpp +++ b/perf/local_thr.cpp @@ -20,7 +20,6 @@ */ #include "../include/xs.h" -#include "../include/xs_utils.h" #include <stdio.h> #include <stdlib.h> diff --git a/perf/remote_lat.cpp b/perf/remote_lat.cpp index 03efe73..0f05d2a 100644 --- a/perf/remote_lat.cpp +++ b/perf/remote_lat.cpp @@ -20,7 +20,6 @@ */ #include "../include/xs.h" -#include "../include/xs_utils.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/perf/remote_thr.cpp b/perf/remote_thr.cpp index f78958c..fe4bbfa 100644 --- a/perf/remote_thr.cpp +++ b/perf/remote_thr.cpp @@ -20,7 +20,6 @@ */ #include "../include/xs.h" -#include "../include/xs_utils.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/xszmq.cpp b/src/xszmq.cpp index b1f892a..d1fb20c 100644 --- a/src/xszmq.cpp +++ b/src/xszmq.cpp @@ -23,7 +23,6 @@ #include "../include/zmq_utils.h" #include "../include/xs.h" -#include "../include/xs_utils.h" #include "platform.hpp" @@ -34,7 +33,7 @@ #if !defined XS_HAVE_WINDOWS #include <unistd.h> #else -#include <windows.hpp> +#include "windows.hpp" #endif void zmq_version (int *major_, int *minor_, int *patch_) 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); } |