diff options
| author | Elliott Hughes <enh@google.com> | 2017-01-30 23:03:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-30 23:03:57 +0000 |
| commit | c0df2e6737bc12fa88cbdcfa76a9c102b0e464c9 (patch) | |
| tree | 98b74241c0c1ddb2af1ddb9b0ed38a7b0b1502a3 | |
| parent | a50924a0d1c098a9503f8b7fd9550801ca45704f (diff) | |
| parent | 61e00348b1972513c58f58403e6f158bec930020 (diff) | |
| download | fio-c0df2e6737bc12fa88cbdcfa76a9c102b0e464c9.tar.gz | |
Keep os/android-os.h compiling now we have __key in <sys/ipc.h>.
am: 61e00348b1
Change-Id: I296ae508c232b1e4f9fa41cc88a6ba2e5bbc9d41
| -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> |