diff options
| author | Garrett D'Amore <garrett@damore.org> | 2020-11-12 21:39:44 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2020-11-12 21:39:44 -0800 |
| commit | 6545ba68696e5a09f0b36f2ea5b60a83b0f88b8b (patch) | |
| tree | ab15e005736d8154dc244443e8f88c86fff701a4 | |
| parent | c62490b0573a9f12f917bb04212f6ecb0d1cdccb (diff) | |
| download | nng-6545ba68696e5a09f0b36f2ea5b60a83b0f88b8b.tar.gz nng-6545ba68696e5a09f0b36f2ea5b60a83b0f88b8b.tar.bz2 nng-6545ba68696e5a09f0b36f2ea5b60a83b0f88b8b.zip | |
Fix build regression on non-Windows platform (sorry!)
| -rw-r--r-- | src/platform/windows/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/supplemental/base64/base64_test.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/platform/windows/CMakeLists.txt b/src/platform/windows/CMakeLists.txt index 251011cf..d6607a64 100644 --- a/src/platform/windows/CMakeLists.txt +++ b/src/platform/windows/CMakeLists.txt @@ -9,11 +9,13 @@ # Windows. -nng_sources_if(NNG_PLATFORM_WINDOWS +# We cannot use nng_sources_if because these tests don't go into +# the static library unless they also go into the dynamic. +if (NNG_PLATFORM_WINDOWS) +nng_sources( win_impl.h win_ipc.h win_tcp.h - win_clock.c win_debug.c win_file.c @@ -32,3 +34,4 @@ nng_sources_if(NNG_PLATFORM_WINDOWS win_thread.c win_udp.c ) +endif()
\ No newline at end of file diff --git a/src/supplemental/base64/base64_test.c b/src/supplemental/base64/base64_test.c index 44609c3e..18da17c6 100644 --- a/src/supplemental/base64/base64_test.c +++ b/src/supplemental/base64/base64_test.c @@ -68,7 +68,7 @@ test_decode(void) TEST_CASE(name); sz = nni_base64_decode(enc, strlen(enc), (void *) buf, 1024); - TEST_CHECK(sz >= 0); + TEST_CHECK(sz != (size_t) -1); TEST_CHECK(sz == strlen(cases[i].decoded)); buf[sz] = 0; TEST_CHECK(strcmp(buf, cases[i].decoded) == 0); |