diff options
author | 2019-01-06 18:17:35 -0800 | |
---|---|---|
committer | 2019-01-06 18:17:35 -0800 | |
commit | d199ec2657e011ff6ca8e5cb0c43fd3f304a292e (patch) | |
tree | 4c5b2961669eb27da04a87fc837420c91dd7ca4a /3rdparty/portaudio | |
parent | 0f0e8853f33bef49bc6f5bd8b53444d209699e44 (diff) |
fix MSVC (llvm toolset) compile (nw)
- conditionally uninitialised variables in PortAudio;
- floats passed to attotime;
- unsigned->signed enums (this one is technically still wrong)
Diffstat (limited to '3rdparty/portaudio')
-rw-r--r-- | 3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c | 2 | ||||
-rw-r--r-- | 3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c | 4 | ||||
-rw-r--r-- | 3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c b/3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c index e8f21af1b14..f0e09ce417a 100644 --- a/3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c +++ b/3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c @@ -2917,7 +2917,7 @@ static PaError StartStream( PaStream *s ) { PaError result = paNoError; PaWinDsStream *stream = (PaWinDsStream*)s; - HRESULT hr; + HRESULT hr = -1; stream->callbackResult = paContinue; PaUtil_ResetBufferProcessor( &stream->bufferProcessor ); diff --git a/3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c b/3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c index 915ca2a0224..9ffe97ec035 100644 --- a/3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c +++ b/3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c @@ -122,7 +122,7 @@ Default is to use the pin category. #define PA_WDMKS_USE_CATEGORY_FOR_PIN_NAMES 1 #endif -#ifdef __GNUC__ +#if defined(__GNUC__) || (defined(_MSC_VER) && defined(__clang__)) #undef PA_LOGE_ #define PA_LOGE_ PA_DEBUG(("%s {\n",__FUNCTION__)) #undef PA_LOGL_ @@ -158,7 +158,7 @@ Default is to use the pin category. #define PA_THREAD_FUNC static DWORD WINAPI #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) #define NOMMIDS #define DYNAMIC_GUID(data) {data} #define _NTRTL_ /* Turn off default definition of DEFINE_GUIDEX */ diff --git a/3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c b/3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c index 7c4a369d99d..7ffe9507b89 100644 --- a/3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c +++ b/3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c @@ -2533,7 +2533,7 @@ static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi, { framesPerBufferProcessorCall = framesPerHostInputBuffer; } - else if( outputParameters ) + else //if( outputParameters ) { framesPerBufferProcessorCall = framesPerHostOutputBuffer; } |