Merge commit '407ac22322e5ce67996ec54ef619cafa4c9ceb78'

* commit '407ac22322e5ce67996ec54ef619cafa4c9ceb78':
  w32pthreads: Map MemoryBarrier to __sync_synchronize on mingw

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h
index 3a2f68f2d5bc47bf7f2ae633a060b5eb2ea7506c..c327962735828e80fe7f57894c79721f6c85d042 100644 (file)
--- a/compat/w32pthreads.h
+++ b/compat/w32pthreads.h
@@ -39,9 +39,9 @@
 #include <windows.h>
 #include <process.h>
 
-/* MinGW requires the intrinsics header for the pthread_once fallback code */
 #if _WIN32_WINNT < 0x0600 && defined(__MINGW32__)
-#include <intrin.h>
+#undef MemoryBarrier
+#define MemoryBarrier __sync_synchronize
 #endif
 
 #include "libavutil/attributes.h"