diff options
author | Elliott Hughes <enh@google.com> | 2017-01-30 23:10:34 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-30 23:10:34 +0000 |
commit | 872c6e685a978f8c9a497e567a7ed5001c172f3e (patch) | |
tree | 98b74241c0c1ddb2af1ddb9b0ed38a7b0b1502a3 | |
parent | ebd62e015cf90eb033414feabb58891496cafa00 (diff) | |
parent | cf41806599b7d50ed4c91aab3815154b8c64324a (diff) | |
download | fio-872c6e685a978f8c9a497e567a7ed5001c172f3e.tar.gz |
Keep os/android-os.h compiling now we have __key in <sys/ipc.h>. am: 61e00348b1 am: c0df2e6737 am: bef3b0ed6eandroid-wear-o-preview-4android-wear-o-preview-3android-wear-8.0.0_r1android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-o-preview-4android-o-preview-3android-o-preview-2android-o-preview-1android-o-iot-preview-5android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-releaseo-preview-4o-preview-3o-preview-2o-previewo-iot-preview-5
am: cf41806599
Change-Id: I419b3f50f6734c42d44caa12b0630f92ad3cd9e4
-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> |