| commit | 872c6e685a978f8c9a497e567a7ed5001c172f3e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jan 30 23:10:34 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 30 23:10:34 2017 +0000 |
| tree | 98b74241c0c1ddb2af1ddb9b0ed38a7b0b1502a3 | |
| parent | ebd62e015cf90eb033414feabb58891496cafa00 [diff] | |
| parent | cf41806599b7d50ed4c91aab3815154b8c64324a [diff] |
Keep os/android-os.h compiling now we have __key in <sys/ipc.h>. am: 61e00348b1 am: c0df2e6737 am: bef3b0ed6e am: cf41806599 Change-Id: I419b3f50f6734c42d44caa12b0630f92ad3cd9e4
diff --git a/os/os-android.h b/os/os-android.h index c002509..96ff5ba 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>