diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-09-24 11:47:35 -0700 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2012-09-24 11:47:35 -0700 |
| commit | 0211cd899a359538feef4f21b41c152d0a4cace3 (patch) | |
| tree | ed94294fd115b07198f85c022536f224114062e4 /vp8 | |
| parent | b501251e2e7a4db4cb1ca2d6cbf24176d2a065dc (diff) | |
| download | libvpx-0211cd899a359538feef4f21b41c152d0a4cace3.tar libvpx-0211cd899a359538feef4f21b41c152d0a4cace3.tar.gz libvpx-0211cd899a359538feef4f21b41c152d0a4cace3.tar.bz2 libvpx-0211cd899a359538feef4f21b41c152d0a4cace3.zip | |
rtcd/win32: prefer win32 primatives to pthreads
Fixes some build issues for people building for win32 who have a
pthreads emulation layer installed.
Change-Id: I0e0003fa01f65020f6ced35d961dcb1130db37a8
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/common/rtcd.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vp8/common/rtcd.c b/vp8/common/rtcd.c index 4980f48ad..3150fff26 100644 --- a/vp8/common/rtcd.c +++ b/vp8/common/rtcd.c @@ -11,16 +11,7 @@ #define RTCD_C #include "vpx_rtcd.h" -#if CONFIG_MULTITHREAD && HAVE_PTHREAD_H -#include <pthread.h> -static void once(void (*func)(void)) -{ - static pthread_once_t lock = PTHREAD_ONCE_INIT; - pthread_once(&lock, func); -} - - -#elif CONFIG_MULTITHREAD && defined(_WIN32) +#if CONFIG_MULTITHREAD && defined(_WIN32) #include <windows.h> static void once(void (*func)(void)) { @@ -44,6 +35,15 @@ static void once(void (*func)(void)) } +#elif CONFIG_MULTITHREAD && HAVE_PTHREAD_H +#include <pthread.h> +static void once(void (*func)(void)) +{ + static pthread_once_t lock = PTHREAD_ONCE_INIT; + pthread_once(&lock, func); +} + + #else /* No-op version that performs no synchronization. vpx_rtcd() is idempotent, * so as long as your platform provides atomic loads/stores of pointers |