From a68221e323bafa1d0f52ced748b221a1dc0cb50c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 4 Jul 2015 11:49:44 +0200 Subject: [PATCH] fix jack/pthread windows condition --- libs/backends/jack/jack_audiobackend.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc index 0960d3bb6e..c3ce0b0d6c 100644 --- a/libs/backends/jack/jack_audiobackend.cc +++ b/libs/backends/jack/jack_audiobackend.cc @@ -860,7 +860,7 @@ JACKAudioBackend::join_process_threads () bool JACKAudioBackend::in_process_thread () { -#if (defined COMPILER_MINGW && !defined PTW32_VERSION) || defined __jack_systemdeps_h__ +#if defined COMPILER_MINGW && (!defined PTW32_VERSION || defined __jack_systemdeps_h__) if (_main_thread == GetCurrentThread()) { return true; } @@ -873,7 +873,7 @@ JACKAudioBackend::in_process_thread () for (std::vector::const_iterator i = _jack_threads.begin (); i != _jack_threads.end(); i++) { -#if (defined COMPILER_MINGW && !defined PTW32_VERSION) || defined __jack_systemdeps_h__ +#if defined COMPILER_MINGW && (!defined PTW32_VERSION || defined __jack_systemdeps_h__) if (*i == GetCurrentThread()) { return true; } @@ -917,7 +917,7 @@ JACKAudioBackend::process_thread () /* JACK doesn't do this for us when we use the wait API */ -#if (defined COMPILER_MINGW && !defined PTW32_VERSION) || defined __jack_systemdeps_h__ +#if defined COMPILER_MINGW && (!defined PTW32_VERSION || defined __jack_systemdeps_h__) _main_thread = GetCurrentThread(); #else _main_thread = pthread_self ();