ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Mon Dec 25 23:17:23 2017 -0300| [613f789c19153edadb1fcc11866192f6b296ee58] | committer: James Almer
w32pthreads: remove some remaining superfluous checks Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=613f789c19153edadb1fcc11866192f6b296ee58 --- compat/w32pthreads.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h index 237cab5677..21acfd2ba1 100644 --- a/compat/w32pthreads.h +++ b/compat/w32pthreads.h @@ -39,11 +39,6 @@ #include <windows.h> #include <process.h> -#if _WIN32_WINNT < 0x0600 && defined(__MINGW32__) -#undef MemoryBarrier -#define MemoryBarrier __sync_synchronize -#endif - #include "libavutil/attributes.h" #include "libavutil/common.h" #include "libavutil/internal.h" @@ -63,10 +58,8 @@ typedef CONDITION_VARIABLE pthread_cond_t; #define PTHREAD_MUTEX_INITIALIZER SRWLOCK_INIT #define PTHREAD_COND_INITIALIZER CONDITION_VARIABLE_INIT -#if _WIN32_WINNT >= 0x0600 #define InitializeCriticalSection(x) InitializeCriticalSectionEx(x, 0, 0) #define WaitForSingleObject(a, b) WaitForSingleObjectEx(a, b, FALSE) -#endif static av_unused unsigned __stdcall attribute_align_arg win32thread_worker(void *arg) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
