Merge pull request #4037 from Lectem:patch-1

acfbed86 · Vadim Pisarevsky · 62120840 · 3c6fe751 · acfbed86
Commit acfbed86 authored May 21, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

system.cpp modules/core/src/system.cpp +1 -1

No files found.
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -923,7 +923,7 @@ struct Mutex::Impl
    int refcount;
 };

-#elif defined __linux__ && !defined ANDROID
+#elif defined __linux__ && !defined ANDROID && !defined __LINUXTHREADS_OLD__

 struct Mutex::Impl
 {