diff options
| author | Elliott Hughes <enh@google.com> | 2013-01-29 18:09:26 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-29 18:09:26 -0800 |
| commit | 5821e11d0b577fda45b81f0c9ea13c1c1c5de1a8 (patch) | |
| tree | 44b15995bdcfb49d993cff37f6ed4dddf35c3007 /libc | |
| parent | 9d995d67217e44e022c9e5d0767634fa81f87b78 (diff) | |
| parent | 7bc49fcfc0de8ce6f386f362cdab6902e6bbe7b4 (diff) | |
| download | bionic-5821e11d0b577fda45b81f0c9ea13c1c1c5de1a8.zip bionic-5821e11d0b577fda45b81f0c9ea13c1c1c5de1a8.tar.gz bionic-5821e11d0b577fda45b81f0c9ea13c1c1c5de1a8.tar.bz2 | |
am 7bc49fcf: am 323287ea: Merge "Fix valgrind build."
# Via Android Git Automerger (1) and others
* commit '7bc49fcfc0de8ce6f386f362cdab6902e6bbe7b4':
Fix valgrind build.
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/include/sys/exec_elf.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libc/include/sys/exec_elf.h b/libc/include/sys/exec_elf.h index 1cc64a4..6d445bf 100644 --- a/libc/include/sys/exec_elf.h +++ b/libc/include/sys/exec_elf.h @@ -700,6 +700,8 @@ typedef struct { Elf64_Xword a_v; /* 64-bit id */ } Aux64Info; +/* BEGIN android-changed: these constants should come from <linux/auxvec.h>. */ +#if 0 /* a_type */ #define AT_NULL 0 /* Marks end of array */ #define AT_IGNORE 1 /* No meaning, a_un is undefined */ @@ -740,6 +742,8 @@ typedef struct { #define AT_SUN_EMUL_EXECFD 2013 /* coff file descriptor */ /* Executable's fully resolved name */ #define AT_SUN_EXECNAME 2014 +#endif +/* END android-changed */ /* * Note Headers |