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