]> granicus.if.org Git - libvpx/commitdiff
vp9_thread: prefer pthread.h if available
authorJames Zern <jzern@google.com>
Tue, 10 Feb 2015 20:47:14 +0000 (12:47 -0800)
committerJames Zern <jzern@google.com>
Tue, 10 Feb 2015 20:47:14 +0000 (12:47 -0800)
this avoids conflicts with recent versions of mingw-w64 (tested g++
4.8.2) and the unit tests

Change-Id: Ic41ea31eebe0e3e712ed5e657f37d8cad6712088

vp9/common/vp9_thread.h

index c24ef5face2fbd70484f44a280fe5a2ecafeca74..12848fedeff0624b91b81a489f7bfcec31492829 100644 (file)
@@ -28,7 +28,7 @@ extern "C" {
 
 #if CONFIG_MULTITHREAD
 
-#if defined(_WIN32)
+#if defined(_WIN32) && !HAVE_PTHREAD_H
 #include <errno.h>  // NOLINT
 #include <process.h>  // NOLINT
 #include <windows.h>  // NOLINT