ardour/livetrax
13
0
Fork 0
Code

Remove a JE addition to one of the qm-dsp source files (no longer needed)

Browse Source
This commit is contained in:
John Emmas 2017-02-06 09:47:10 +00:00
parent 5dabe45341
commit 715b9a959a
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/pbd/pbd/msvc_pbd.h
View File

@ -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

4
libs/qm-dsp/dsp/wavelet/Wavelet.cpp
View File

@ -17,10 +17,6 @@
#include <cassert>
#ifdef _MSC_VER
#pragma warning(disable:4305)
#endif
std::string
Wavelet::getWaveletName(Type wavelet)
{

2
msvc_extra_headers/ardourext/sys/time.h.input
View File

@ -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 */