From 5a860d87c734b4b224b2881e30509c155cab458d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20A=2E=20Col=C3=B3n=20V=C3=A9lez?= Date: Fri, 7 Aug 2015 05:57:35 -0400 Subject: [PATCH] Merge back the local changes. --- 3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c b/3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c index 38621e2807..3eddf35539 100644 --- a/3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c +++ b/3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c @@ -157,13 +157,13 @@ Default is to use the pin category. #endif #ifdef _MSC_VER -#define NOMMIDS +//#define NOMMIDS #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) +//#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) #endif #include