From f96196dfdcf8ab8bad26ad76c360b0d3594f90ad Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Sun, 15 Dec 2019 02:48:30 -0600 Subject: [PATCH] Create and apply VS2015 compatibility patch --- .../portaudio-v19/src/hostapi/jack/pa_jack.c | 2 +- .../src/hostapi/wdmks/pa_win_wdmks.c | 2 +- lib-src/portaudio-v19/vs2015.patch | 26 +++++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 lib-src/portaudio-v19/vs2015.patch diff --git a/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c b/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c index 887128c3b..787d81ddb 100644 --- a/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c +++ b/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c @@ -441,7 +441,7 @@ static void PaJack_WaitForStreamDataToBecomeAvailable( PaJackStream *stream ) #endif } -#if defined(WIN32) +#if defined(WIN32) && _MSC_VER < 1900 #define snprintf _snprintf #endif diff --git a/lib-src/portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c b/lib-src/portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c index 70a48d8ff..d413391a2 100644 --- a/lib-src/portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c +++ b/lib-src/portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c @@ -101,7 +101,7 @@ of a device for the duration of active stream using those devices #include -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf #define vsnprintf _vsnprintf #endif diff --git a/lib-src/portaudio-v19/vs2015.patch b/lib-src/portaudio-v19/vs2015.patch new file mode 100644 index 000000000..96e5c8024 --- /dev/null +++ b/lib-src/portaudio-v19/vs2015.patch @@ -0,0 +1,26 @@ +diff --git a/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c b/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c +index 887128c3b..787d81ddb 100644 +--- a/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c ++++ b/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c +@@ -441,7 +441,7 @@ static void PaJack_WaitForStreamDataToBecomeAvailable( PaJackStream *stream ) + #endif + } + +-#if defined(WIN32) ++#if defined(WIN32) && _MSC_VER < 1900 + #define snprintf _snprintf + #endif + +diff --git a/lib-src/portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c b/lib-src/portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c +index 70a48d8ff..d413391a2 100644 +--- a/lib-src/portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c ++++ b/lib-src/portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c +@@ -101,7 +101,7 @@ of a device for the duration of active stream using those devices + + #include + +-#ifdef _MSC_VER ++#if defined(_MSC_VER) && _MSC_VER < 1900 + #define snprintf _snprintf + #define vsnprintf _vsnprintf + #endif