aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meson.build4
-rw-r--r--src/worker.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index bc6bf43..f05b8e7 100644
--- a/meson.build
+++ b/meson.build
@@ -116,6 +116,7 @@ elif cc.get_id() == 'gcc'
elif cc.get_id() == 'msvc'
if warning_level == 'everything'
c_suppressions += [
+ '/wd4062', # enumerator in switch is not handled
'/wd4191', # unsafe function conversion
'/wd4200', # zero-sized array in struct/union
'/wd4242', # possible loss of data from float conversion
@@ -123,6 +124,7 @@ elif cc.get_id() == 'msvc'
'/wd4267', # possible loss of data from size conversion
'/wd4365', # signed/unsigned mismatch
'/wd4514', # unreferenced inline function has been removed
+ '/wd4668', # not defined as a preprocessor macro
'/wd4706', # assignment within conditional expression
'/wd4710', # function not inlined
'/wd4711', # function selected for automatic inline expansion
@@ -451,7 +453,7 @@ common_dependencies = [
common_c_args = c_suppressions + platform_defines + suil_defines
# Internal JACK client library
-if jack_dep.found()
+if jack_dep.found() and host_machine.system() != 'windows'
shared_library(
'jalv',
sources + files('src/jack_internal.c', 'src/jalv_console.c'),
diff --git a/src/worker.c b/src/worker.c
index f9d4060..b131b3e 100644
--- a/src/worker.c
+++ b/src/worker.c
@@ -57,7 +57,7 @@ jalv_worker_respond(LV2_Worker_Respond_Handle handle,
return jalv_worker_write_packet(((JalvWorker*)handle)->responses, size, data);
}
-static void*
+static ZixThreadResult ZIX_THREAD_FUNC
worker_func(void* const data)
{
JalvWorker* const worker = (JalvWorker*)data;
@@ -95,7 +95,7 @@ worker_func(void* const data)
free(buf);
worker->state = STATE_STOPPED;
- return NULL;
+ return ZIX_THREAD_RESULT;
}
JalvWorker*