diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-26 03:04:27 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-26 03:04:27 +0000 |
| commit | fdf7b4586fe91756b9a8b6ed1bf5d9b37c1aab6d (patch) | |
| tree | 578ac23531fd4e964b00949c1ecb2f9f96dfdda8 | |
| parent | 286d567bbffb1baef497ecfe9a91fa690ecb7526 (diff) | |
| download | ruby-fdf7b4586fe91756b9a8b6ed1bf5d9b37c1aab6d.tar.gz | |
* addr2line.c: Include ELF header after system headers (especially
sys/types.h) to avoid compilation failure,
"usr/include/sh3/elf_machdep.h:4:2: error: #error Define _BYTE_ORDER!",
on NetBSD/sh3 (dreamcast, hpcsh, landisk, mmeye).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | addr2line.c | 11 |
2 files changed, 13 insertions, 5 deletions
@@ -1,3 +1,10 @@ +Sat Oct 26 11:59:13 2013 Tanaka Akira <akr@fsij.org> + + * addr2line.c: Include ELF header after system headers (especially + sys/types.h) to avoid compilation failure, + "usr/include/sh3/elf_machdep.h:4:2: error: #error Define _BYTE_ORDER!", + on NetBSD/sh3 (dreamcast, hpcsh, landisk, mmeye). + Sat Oct 26 11:35:22 2013 Koichi Sasada <ko1@atdot.net> * gc.c: tuning parameters. diff --git a/addr2line.c b/addr2line.c index f89a9d24fe..f936694724 100644 --- a/addr2line.c +++ b/addr2line.c @@ -17,11 +17,6 @@ #ifdef USE_ELF -#ifdef __OpenBSD__ -#include <elf_abi.h> -#else -#include <elf.h> -#endif #include <fcntl.h> #include <limits.h> #include <stdio.h> @@ -33,6 +28,12 @@ #include <sys/stat.h> #include <unistd.h> +#ifdef __OpenBSD__ +#include <elf_abi.h> +#else +#include <elf.h> +#endif + /* Make alloca work the best possible way. */ #ifdef __GNUC__ # ifndef atarist |