diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2017-02-06 09:47:10 +0000 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2017-02-06 09:47:10 +0000 |
| commit | 715b9a959a997ae36c1567527e66b089dd70f7fb (patch) | |
| tree | 6016910e29b0bd601fd0b2440917c83138fafdd9 | |
| parent | 5dabe45341781bb917af11745dfc269ce8f747dd (diff) | |
Remove a JE addition to one of the qm-dsp source files (no longer needed)
| -rw-r--r-- | libs/pbd/pbd/msvc_pbd.h | 2 | ||||
| -rw-r--r-- | libs/qm-dsp/dsp/wavelet/Wavelet.cpp | 4 | ||||
| -rw-r--r-- | 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 <rpc.h> 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 <cassert> -#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 <WinSock2.h> /* gets 'struct timeval' - Changed by JE - 23-07-2013. Was formerly. . . #include <WinSock.h> */ /* 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 */ |