From: Nemirtingas <9432037+Nemirtingas@users.noreply.github.com> Date: Tue, 8 Dec 2020 06:28:56 +0000 (+0100) Subject: Fix GUID defines in pa_win_wdmks.c when compiling with clang-cl (#327) X-Git-Tag: v19.7.0~89 X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=e5279859cecd4d2e0bd68b6cfc07a5c40a73a5eb;p=portaudio Fix GUID defines in pa_win_wdmks.c when compiling with clang-cl (#327) Fix GUID defines in pa_win_wdmks.c when compiling with clang-cl Co-authored-by: Nemirtingas --- diff --git a/src/hostapi/wdmks/pa_win_wdmks.c b/src/hostapi/wdmks/pa_win_wdmks.c index 15ba438..add663b 100644 --- a/src/hostapi/wdmks/pa_win_wdmks.c +++ b/src/hostapi/wdmks/pa_win_wdmks.c @@ -163,9 +163,15 @@ Default is to use the pin category. #define DYNAMIC_GUID(data) {data} #define _NTRTL_ /* Turn off default definition of DEFINE_GUIDEX */ #undef DEFINE_GUID -#define DEFINE_GUID(n,data) EXTERN_C const GUID n = {data} -#define DEFINE_GUID_THUNK(n,data) DEFINE_GUID(n,data) -#define DEFINE_GUIDEX(n) DEFINE_GUID_THUNK(n, STATIC_##n) +#ifdef __clang__ /* clang-cl: avoid too many arguments error */ + #define DEFINE_GUID(n, ...) EXTERN_C const GUID n = {__VA_ARGS__} + #define DEFINE_GUID_THUNK(n, ...) DEFINE_GUID(n, __VA_ARGS__) + #define DEFINE_GUIDEX(n) DEFINE_GUID_THUNK(n, STATIC_##n) +#else + #define DEFINE_GUID(n, data) EXTERN_C const GUID n = {data} + #define DEFINE_GUID_THUNK(n, data) DEFINE_GUID(n, data) + #define DEFINE_GUIDEX(n) DEFINE_GUID_THUNK(n, STATIC_##n) +#endif /* __clang__ */ #endif #include