ref: 42f9104d5c4e3b7f91f3e49a5e085cf0096e08c0
parent: ff7783a670299c112a308809d3f483347625535c
parent: de50520a8c88afa53679a2dd6c77d5be54503436
author: John Koleszar <jkoleszar@google.com>
date: Wed Mar 16 20:05:07 EDT 2011
Merge remote branch 'internal/upstream' into HEAD
--- 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"