ruby-changes:31347
From: akr <ko1@a...>
Date: Sat, 26 Oct 2013 12:04:41 +0900 (JST)
Subject: [ruby-changes:31347] akr:r43426 (trunk): * addr2line.c: Include ELF header after system headers (especially
akr 2013-10-26 12:04:27 +0900 (Sat, 26 Oct 2013) New Revision: 43426 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43426 Log: * 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). Modified files: trunk/ChangeLog trunk/addr2line.c Index: ChangeLog =================================================================== --- ChangeLog (revision 43425) +++ ChangeLog (revision 43426) @@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Sat Oct 26 11:59:13 2013 Tanaka Akira <akr@f...> + + * 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@a...> * gc.c: tuning parameters. Index: addr2line.c =================================================================== --- addr2line.c (revision 43425) +++ addr2line.c (revision 43426) @@ -17,11 +17,6 @@ https://github.com/ruby/ruby/blob/trunk/addr2line.c#L17 #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 @@ https://github.com/ruby/ruby/blob/trunk/addr2line.c#L28 #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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/