Merge commit '407ac22322e5ce67996ec54ef619cafa4c9ceb78'

* commit '407ac22322e5ce67996ec54ef619cafa4c9ceb78': w32pthreads: Map MemoryBarrier to __sync_synchronize on mingw Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago · c1b712e078
parent 859c4ae402 407ac22322
commit c1b712e078
1 changed files with 2 additions and 2 deletions
--- 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"