diff options
| -rw-r--r-- | libunwind/src/AddressSpace.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libunwind/src/AddressSpace.hpp b/libunwind/src/AddressSpace.hpp index 2c9a083be2a..bf57fdacbe6 100644 --- a/libunwind/src/AddressSpace.hpp +++ b/libunwind/src/AddressSpace.hpp @@ -497,9 +497,6 @@ inline bool LocalAddressSpace::findUnwindSections(pint_t targetAddr, #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 @@ inline bool LocalAddressSpace::findUnwindSections(pint_t targetAddr, #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) - |
