elf.h: rename ELF_MAGIC to ELFMAG

Operating Systems / Haiku - Adrien Destugues [gmail.com] - 6 August 2016 13:32 UTC

- This is how it is named in other versions of elf.h (Linux, glibc, possibly more)- ELF_MAGIC is used by libelf for the same thing, and the defines conflicts, breaking libelf build on Haiku.

8efb6db elf.h: rename ELF_MAGIC to ELFMAG
headers/os/kernel/elf.h | 2 +-
src/kits/debug/Image.cpp | 2 +-
src/kits/debugger/elf/ElfFile.cpp | 2 +-
src/libs/libunwind/elfxx.h | 3 ---
src/system/boot/loader/elf.cpp | 2 +-
src/system/kernel/debug/core_dump.cpp | 8 ++++----
src/system/kernel/elf.cpp | 2 +-
src/system/runtime_loader/elf_load_image.cpp | 2 +-
src/system/runtime_loader/runtime_loader.cpp | 2 +-
9 files changed, 11 insertions(+), 14 deletions(-)

Upstream: cgit.haiku-os.org

  • Share