ref: 53d11fa6ad8dc65cf335a108b0830dac07175c11
parent: 386ceca8d27d77f33e9877506bbc714ce74af075
parent: de50520a8c88afa53679a2dd6c77d5be54503436
author: John Koleszar <jkoleszar@google.com>
date: Wed Mar 16 20:05:08 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: I3f6c1e297fc0d33dc239bb4dd41d5afbcd91de19
--- a/build/make/Makefile
+++ b/build/make/Makefile
@@ -152,7 +152,7 @@
# 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
--- 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>
--- 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"
--
⑨