From fec787c8f4ec3acfded49948ae5b651f79f17488 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 11 Oct 2018 17:25:26 +0200 Subject: [PATCH] zita-convolver windows/mingw build fix - semaphore is available, - pthread_t is not a pointer type (but here it's not used anyway) --- libs/zita-convolver/zita-convolver.cc | 6 ++++++ libs/zita-convolver/zita-convolver/zita-convolver.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/zita-convolver/zita-convolver.cc b/libs/zita-convolver/zita-convolver.cc index 3ccd796d76..3a2d053be9 100644 --- a/libs/zita-convolver/zita-convolver.cc +++ b/libs/zita-convolver/zita-convolver.cc @@ -410,7 +410,9 @@ Convlevel::Convlevel (void) , _npar (0) , _parsize (0) , _options (0) +#ifndef PTW32_VERSION , _pthr (0) +#endif , _inp_list (0) , _out_list (0) , _plan_r2c (0) @@ -592,7 +594,9 @@ Convlevel::start (int abspri, int policy) pthread_attr_t attr; struct sched_param parm; +#ifndef PTW32_VERSION _pthr = 0; +#endif min = sched_get_priority_min (policy); max = sched_get_priority_max (policy); abspri += _prio; @@ -677,7 +681,9 @@ Convlevel::main (void) _trig.wait (); if (_stat == ST_TERM) { _stat = ST_IDLE; +#ifndef PTW32_VERSION _pthr = 0; +#endif return; } process (false); diff --git a/libs/zita-convolver/zita-convolver/zita-convolver.h b/libs/zita-convolver/zita-convolver/zita-convolver.h index 58253c0e5c..e655c63643 100644 --- a/libs/zita-convolver/zita-convolver/zita-convolver.h +++ b/libs/zita-convolver/zita-convolver/zita-convolver.h @@ -33,7 +33,7 @@ namespace ArdourZita { #undef ZCSEMA_IS_IMPLEMENTED #endif -#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined (_WIN32) #include