summaryrefslogtreecommitdiff
path: root/libs/backends/jack/weak_libjack.c
diff options
context:
space:
mode:
authorJohn Emmas <johne53@tiscali.co.uk>2014-10-24 18:34:01 +0100
committerJohn Emmas <johne53@tiscali.co.uk>2014-10-24 18:45:51 +0100
commit3d396897695c5b44c0703575be672661e9e6c3c9 (patch)
tree16d6d68f3f380570d1b31078357bce6d56f58beb /libs/backends/jack/weak_libjack.c
parentf90071113654c5d788e90196db5ee1dedd11172f (diff)
Some minor bits of casting to keep MSVC happy when building 'backends/jack/weak_libjack.c'
Diffstat (limited to 'libs/backends/jack/weak_libjack.c')
-rw-r--r--libs/backends/jack/weak_libjack.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/backends/jack/weak_libjack.c b/libs/backends/jack/weak_libjack.c
index e2a1f7f01c..4e137ab715 100644
--- a/libs/backends/jack/weak_libjack.c
+++ b/libs/backends/jack/weak_libjack.c
@@ -55,7 +55,7 @@ static void* lib_symbol(void* const lib, const char* const sym) {
#ifdef COMPILER_MSVC
typedef void * pvoid_t;
-#define MAPSYM(SYM, FAIL) _j._ ## SYM = lib_symbol(lib, "jack_" # SYM); \
+#define MAPSYM(SYM, FAIL) _j._ ## SYM = (func_t)lib_symbol(lib, "jack_" # SYM); \
if (!_j._ ## SYM) err |= FAIL;
#else
typedef void * __attribute__ ((__may_alias__)) pvoid_t;
@@ -186,7 +186,7 @@ jack_client_t * WJACK_client_open2 (const char *client_name, jack_options_t opti
return ((jack_client_t* (*)(const char *, jack_options_t, jack_status_t *, ...))(_j._client_open))(client_name, options, status, uuid);
} else {
WJACK_WARNING(client_open);
- if (status) *status = 0;
+ if (status) *status = (jack_status_t)0;
return NULL;
}
}
@@ -196,7 +196,7 @@ jack_client_t * WJACK_client_open1 (const char *client_name, jack_options_t opti
return ((jack_client_t* (*)(const char *, jack_options_t, jack_status_t *, ...))_j._client_open)(client_name, options, status);
} else {
WJACK_WARNING(client_open);
- if (status) *status = 0;
+ if (status) *status = (jack_status_t)0;
return NULL;
}
}