commit 5983a02b4b9640277e41b882dbd8382c348f1894
author Dmitriy Ivanov <dimitry@google.com> Fri Oct 10 16:40:55 2014 -0700
committer Dmitriy Ivanov <dimitry@google.com> Tue Dec 09 10:57:26 2014 -0800
tree f902c3c4b3f8847cc3c26e5aa163c1d343508d74
parent e7124d787c7963b2d6efa7bdcda8cf9cc891ff72

Fix Elf32_Nhdr redefinition

  This is no longer necessary

Upstream bug: https://bugs.kde.org/show_bug.cgi?id=339861

(cherry picked from commit a3687177b3409cbb5eb38928ae51b21c9f91e9a5)

Change-Id: Ib2c391e8f41957e06e553a3abdefed77ac3f90e8

main/coregrind/m_coredump/coredump-elf.c

diff --git a/main/coregrind/m_coredump/coredump-elf.c b/main/coregrind/m_coredump/coredump-elf.c
index 93b8995..a4e368e 100644
--- a/main/coregrind/m_coredump/coredump-elf.c
+++ b/main/coregrind/m_coredump/coredump-elf.c
@@ -136,18 +136,6 @@
    phdr->p_align = VKI_PAGE_SIZE;
 }
 
-#if defined(VGPV_arm_linux_android) || defined(VGPV_x86_linux_android) \
-    || defined(VGPV_mips32_linux_android)
-/* Android's libc doesn't provide a definition for this.  Hence: */
-typedef
-   struct {
-      Elf32_Word n_namesz;
-      Elf32_Word n_descsz;
-      Elf32_Word n_type;
-   }
-   Elf32_Nhdr;
-#endif
-
 struct note {
    struct note *next;
    ESZ(Nhdr) note;