From 715b9a959a997ae36c1567527e66b089dd70f7fb Mon Sep 17 00:00:00 2001 From: John Emmas Date: Mon, 6 Feb 2017 09:47:10 +0000 Subject: [PATCH] Remove a JE addition to one of the qm-dsp source files (no longer needed) --- libs/pbd/pbd/msvc_pbd.h | 2 +- libs/qm-dsp/dsp/wavelet/Wavelet.cpp | 4 ---- msvc_extra_headers/ardourext/sys/time.h.input | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libs/pbd/pbd/msvc_pbd.h b/libs/pbd/pbd/msvc_pbd.h index 462eafc756..7c981582c5 100644 --- a/libs/pbd/pbd/msvc_pbd.h +++ b/libs/pbd/pbd/msvc_pbd.h @@ -142,7 +142,7 @@ LIBPBD_API char* PBD_APICALLTYPE dlerror () __THROW; /* For whatever reason, Ardour's 'libevoral' refuses to build as a DLL if we include both 'rpc.h' */ /* and 'WinSock2.h'. It doesn't seem to matter which order we #include them. Given that we can't */ /* edit 'rpc.h' or 'WinSock2.h', just make sure we don't #include them when building libevoral. */ -#if !defined(BUILDING_EVORAL) && !defined(BUILDING_VAMPPLUGINS) +#if !defined(BUILDING_EVORAL) && !defined(BUILDING_QMDSP) && !defined(BUILDING_VAMPPLUGINS) #include typedef int (FAR PBDEXTN_APICALLTYPE *CYGINIT_API)(unsigned int); #endif diff --git a/libs/qm-dsp/dsp/wavelet/Wavelet.cpp b/libs/qm-dsp/dsp/wavelet/Wavelet.cpp index 2196f1c914..764c84b24a 100644 --- a/libs/qm-dsp/dsp/wavelet/Wavelet.cpp +++ b/libs/qm-dsp/dsp/wavelet/Wavelet.cpp @@ -17,10 +17,6 @@ #include -#ifdef _MSC_VER -#pragma warning(disable:4305) -#endif - std::string Wavelet::getWaveletName(Type wavelet) { diff --git a/msvc_extra_headers/ardourext/sys/time.h.input b/msvc_extra_headers/ardourext/sys/time.h.input index b989d0cd36..1f1fde5063 100644 --- a/msvc_extra_headers/ardourext/sys/time.h.input +++ b/msvc_extra_headers/ardourext/sys/time.h.input @@ -7,7 +7,7 @@ typedef long __suseconds_t; typedef __suseconds_t suseconds_t; #endif -#if !defined(BUILDING_EVORAL) && !defined(BUILDING_VAMPPLUGINS) +#if !defined(BUILDING_EVORAL) && !defined(BUILDING_QMDSP) && !defined(BUILDING_VAMPPLUGINS) #include /* gets 'struct timeval' - Changed by JE - 23-07-2013. Was formerly. . . #include */ /* For whatever reason, Ardour's 'libevoral' refuses to build as a DLL if we include both 'rpc.h' */ /* and 'WinSock2.h'. It doesn't seem to matter which order we #include them. Given that we can't */ -- 2.30.2