Page MenuHomePhabricator

D67804.diff
No OneTemporary

File Metadata

Created
Thu, Feb 20, 12:50 AM

D67804.diff

Index: libunwind/src/AddressSpace.hpp
===================================================================
--- libunwind/src/AddressSpace.hpp
+++ libunwind/src/AddressSpace.hpp
@@ -497,9 +497,6 @@
#if !defined(Elf_Phdr)
typedef ElfW(Phdr) Elf_Phdr;
#endif
-#if !defined(Elf_Addr) && defined(__ANDROID__)
- typedef ElfW(Addr) Elf_Addr;
-#endif
#if defined(_LIBUNWIND_SUPPORT_DWARF_UNWIND)
#if !defined(_LIBUNWIND_SUPPORT_DWARF_INDEX)
@@ -507,6 +504,9 @@
#endif
size_t object_length;
#if defined(__ANDROID__)
+# if !defined(Elf_Addr)
+ typedef ElfW(Addr) Elf_Addr;
+# endif
Elf_Addr image_base =
pinfo->dlpi_phnum
? reinterpret_cast<Elf_Addr>(pinfo->dlpi_phdr) -

Event Timeline