smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

Some minor bits of casting to keep MSVC happy when building 'backends/jack/weak_libjack.c'

Browse source
This commit is contained in:
John Emmas 2014-10-24 18:34:01 +01:00
parent f900711136
commit 3d39689769
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/backends/jack/weak_libjack.c
View file

@ -55,7 +55,7 @@ static void* lib_symbol(void* const lib, const char* const sym) {
#ifdef COMPILER_MSVC #ifdef COMPILER_MSVC
typedef void * pvoid_t; 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; if (!_j._ ## SYM) err |= FAIL;
#else #else
typedef void * __attribute__ ((__may_alias__)) pvoid_t; 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); return ((jack_client_t* (*)(const char *, jack_options_t, jack_status_t *, ...))(_j._client_open))(client_name, options, status, uuid);
} else { } else {
WJACK_WARNING(client_open); WJACK_WARNING(client_open);
if (status) *status = 0; if (status) *status = (jack_status_t)0;
return NULL; 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); return ((jack_client_t* (*)(const char *, jack_options_t, jack_status_t *, ...))_j._client_open)(client_name, options, status);
} else { } else {
WJACK_WARNING(client_open); WJACK_WARNING(client_open);
if (status) *status = 0; if (status) *status = (jack_status_t)0;
return NULL; return NULL;
} }
} }