From: James Zern <jzern@google.com>
Date: Tue, 10 Feb 2015 20:47:14 +0000 (-0800)
Subject: vp9_thread: prefer pthread.h if available
X-Git-Tag: v1.4.0~152^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d167a1ae;p=libvpx

vp9_thread: prefer pthread.h if available

this avoids conflicts with recent versions of mingw-w64 (tested g++
4.8.2) and the unit tests

Change-Id: Ic41ea31eebe0e3e712ed5e657f37d8cad6712088
---

diff --git a/vp9/common/vp9_thread.h b/vp9/common/vp9_thread.h
index c24ef5fac..12848fede 100644
--- a/vp9/common/vp9_thread.h
+++ b/vp9/common/vp9_thread.h
@@ -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