diff options
| author | Robin Gareus <robin@gareus.org> | 2014-03-04 15:25:58 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-03-04 15:25:58 +0100 |
| commit | 912f07b919c1ec44f0cdd5278d74a9bc29b91846 (patch) | |
| tree | 1cd5f158ada5e8b9b73cf0d52ca5f9fa430c1fe9 /libs/surfaces | |
| parent | 3e250d5f0649256c8e4c7c53da4f67383dd52f78 (diff) | |
mingw build fixes (tested with i686-w64-mingw32 on linux-x86_64)
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/mackie/strip.cc | 13 | ||||
| -rw-r--r-- | libs/surfaces/osc/osc.cc | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index 1893e31b8d..2b9167e386 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -58,6 +58,19 @@ using namespace std; using namespace ARDOUR; using namespace PBD; +#ifndef timeradd /// only avail with __USE_BSD +#define timeradd(a,b,result) \ + do { \ + (result)->tv_sec = (a)->tv_sec + (b)->tv_sec; \ + (result)->tv_usec = (a)->tv_usec + (b)->tv_usec; \ + if ((result)->tv_usec >= 1000000) \ + { \ + ++(result)->tv_sec; \ + (result)->tv_usec -= 1000000; \ + } \ + } while (0) +#endif + #define ui_context() MackieControlProtocol::instance() /* a UICallback-derived object that specifies the event loop for signal handling */ Strip::Strip (Surface& s, const std::string& name, int index, const map<Button::ID,StripButtonInfo>& strip_buttons) diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index e252d22e3d..8bc791a1ee 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -24,7 +24,6 @@ #include <cerrno> #include <algorithm> -#include <sys/poll.h> #include <unistd.h> #include <fcntl.h> |