diff options
| author | Elliott Hughes <enh@google.com> | 2017-01-28 09:08:47 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2017-01-28 09:08:47 -0800 |
| commit | 61e00348b1972513c58f58403e6f158bec930020 (patch) | |
| tree | 98b74241c0c1ddb2af1ddb9b0ed38a7b0b1502a3 | |
| parent | a50924a0d1c098a9503f8b7fd9550801ca45704f (diff) | |
| download | fio-61e00348b1972513c58f58403e6f158bec930020.tar.gz | |
Keep os/android-os.h compiling now we have __key in <sys/ipc.h>.
When we've switched the NDK to unified headers (and perhaps the
compatibility library too) we should send a whole new cleaned up
version of this file upstream...
Bug: N/A
Test: builds
Change-Id: Icf8cbd678b05bbb66bd1a4091a338c696d749478
| -rw-r--r-- | os/os-android.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/os/os-android.h b/os/os-android.h index c0025094..96ff5ba2 100644 --- a/os/os-android.h +++ b/os/os-android.h @@ -62,6 +62,7 @@ #define SHM_HUGETLB 04000 #define shmid_ds shmid64_ds +#undef __key #include <stdio.h> #include <linux/ashmem.h> |