ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 8e1697e7: Merge "Fix mac sdk build."

Browse source 
* commit '8e1697e7528f88985a5d702af53ef5d446f65fa1':
  Fix mac sdk build.
This commit is contained in:
Christopher Ferris 2015-03-24 05:00:51 +00:00 • committed by Android Git Automerger
commit 730d7c530a
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/cutils/threads.h
View file

@ -32,6 +32,7 @@ extern "C" {
#if !defined(_WIN32) #if !defined(_WIN32)
#include <pthread.h> #include <pthread.h>
#include <sys/types.h>
typedef struct { typedef struct {
pthread_mutex_t lock; pthread_mutex_t lock;

2
libcutils/threads.c
View file

@ -21,6 +21,8 @@
// For gettid. // For gettid.
#if defined(__APPLE__) #if defined(__APPLE__)
#include "AvailabilityMacros.h" // For MAC_OS_X_VERSION_MAX_ALLOWED #include "AvailabilityMacros.h" // For MAC_OS_X_VERSION_MAX_ALLOWED
#include <stdint.h>
#include <stdlib.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>