summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Ferris2015-03-23 23:55:36 -0500
committerGerrit Code Review2015-03-23 23:55:37 -0500
commit8e1697e7528f88985a5d702af53ef5d446f65fa1 (patch)
tree114744ccf48cb304c357fb3c6af520fa4eb3d9ef
parent9c5a5b3c2bb25de486135eee4c61bd7695a80d2d (diff)
parentfc3576f675185281ae868e40d8cd2ddb7c7a45a0 (diff)
downloadplatform-system-core-8e1697e7528f88985a5d702af53ef5d446f65fa1.tar.gz
platform-system-core-8e1697e7528f88985a5d702af53ef5d446f65fa1.tar.xz
platform-system-core-8e1697e7528f88985a5d702af53ef5d446f65fa1.zip
Merge "Fix mac sdk build."
-rw-r--r--include/cutils/threads.h1
-rw-r--r--libcutils/threads.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/include/cutils/threads.h b/include/cutils/threads.h
index bb9fdb858..3133cdb04 100644
--- a/include/cutils/threads.h
+++ b/include/cutils/threads.h
@@ -32,6 +32,7 @@ extern "C" {
32#if !defined(_WIN32) 32#if !defined(_WIN32)
33 33
34#include <pthread.h> 34#include <pthread.h>
35#include <sys/types.h>
35 36
36typedef struct { 37typedef struct {
37 pthread_mutex_t lock; 38 pthread_mutex_t lock;
diff --git a/libcutils/threads.c b/libcutils/threads.c
index 940044199..5f5577b42 100644
--- a/libcutils/threads.c
+++ b/libcutils/threads.c
@@ -21,6 +21,8 @@
21// For gettid. 21// For gettid.
22#if defined(__APPLE__) 22#if defined(__APPLE__)
23#include "AvailabilityMacros.h" // For MAC_OS_X_VERSION_MAX_ALLOWED 23#include "AvailabilityMacros.h" // For MAC_OS_X_VERSION_MAX_ALLOWED
24#include <stdint.h>
25#include <stdlib.h>
24#include <sys/syscall.h> 26#include <sys/syscall.h>
25#include <sys/time.h> 27#include <sys/time.h>
26#include <unistd.h> 28#include <unistd.h>