diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-17 00:05:08 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-17 00:05:08 -0400 |
| commit | 53d11fa6ad8dc65cf335a108b0830dac07175c11 (patch) | |
| tree | 7bf7f743a28c8ccf7524add0f51660786bf908af | |
| parent | 386ceca8d27d77f33e9877506bbc714ce74af075 (diff) | |
| parent | de50520a8c88afa53679a2dd6c77d5be54503436 (diff) | |
| download | libvpx-53d11fa6ad8dc65cf335a108b0830dac07175c11.tar libvpx-53d11fa6ad8dc65cf335a108b0830dac07175c11.tar.gz libvpx-53d11fa6ad8dc65cf335a108b0830dac07175c11.tar.bz2 libvpx-53d11fa6ad8dc65cf335a108b0830dac07175c11.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I3f6c1e297fc0d33dc239bb4dd41d5afbcd91de19
| -rwxr-xr-x | build/make/Makefile | 2 | ||||
| -rw-r--r-- | vp8/common/threading.h | 1 | ||||
| -rw-r--r-- | vp8/decoder/threading.c | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/build/make/Makefile b/build/make/Makefile index 5e3c904d9..5c90463be 100755 --- a/build/make/Makefile +++ b/build/make/Makefile @@ -152,7 +152,7 @@ endif # Rule to extract assembly constants from C sources # obj_int_extract: build/make/obj_int_extract.c - $(if $(quiet),echo " [HOSTCC] $@") + $(if $(quiet),@echo " [HOSTCC] $@") $(qexec)$(HOSTCC) -I. -I$(SRC_PATH_BARE) -o $@ $< CLEAN-OBJS += obj_int_extract diff --git a/vp8/common/threading.h b/vp8/common/threading.h index bfd4916c6..44eaf0800 100644 --- a/vp8/common/threading.h +++ b/vp8/common/threading.h @@ -38,6 +38,7 @@ #define pthread_self() GetCurrentThreadId() #else #ifdef __APPLE__ +#include <mach/mach_init.h> #include <mach/semaphore.h> #include <mach/task.h> #include <time.h> diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index 314a8d7fd..67e578c62 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -12,9 +12,6 @@ #if !defined(WIN32) && CONFIG_OS_SUPPORT == 1 # include <unistd.h> #endif -#ifdef __APPLE__ -#include <mach/mach_init.h> -#endif #include "onyxd_int.h" #include "vpx_mem/vpx_mem.h" #include "vp8/common/threading.h" |