am ee022be9: am c31de501: Merge "More Mac fix."

* commit 'ee022be9f8ab7614efaba9f393f6eb42f92fe43b':
  More Mac fix.
This commit is contained in:
Dan Albert 2015-03-23 23:51:39 +00:00 committed by Android Git Automerger
commit ce21c1c573

View file

@ -23,6 +23,7 @@
#include "AvailabilityMacros.h" // For MAC_OS_X_VERSION_MAX_ALLOWED
#include <sys/syscall.h>
#include <sys/time.h>
#include <unistd.h>
#elif defined(__linux__) && !defined(__ANDROID__)
#include <syscall.h>
#include <unistd.h>