diff options
| author | James Zern <jzern@google.com> | 2015-02-10 12:47:14 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-02-10 12:47:14 -0800 |
| commit | d167a1aeee79a484f3ace9160089cf7009283ea3 (patch) | |
| tree | 0f6e766c63f69bb0fe288f333a8a373f2707d54e /vp9/common | |
| parent | 2d924161c74ede567c925ab26ce489d78af12ccd (diff) | |
| download | libvpx-d167a1aeee79a484f3ace9160089cf7009283ea3.tar libvpx-d167a1aeee79a484f3ace9160089cf7009283ea3.tar.gz libvpx-d167a1aeee79a484f3ace9160089cf7009283ea3.tar.bz2 libvpx-d167a1aeee79a484f3ace9160089cf7009283ea3.zip | |
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
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_thread.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |