Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* addr2line.c: use USE_ELF instead of __ELF__ because Solaris

  doesn't define it. USE_ELF is already provided by configure.
  patched by Naohisa Goto. [ruby-dev:44066] [Bug #4998]

* addr2line.h: ditto.

* vm_dump.c: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit e33183acca3d11bbfae6f4551bca890cf7d4280a 1 parent 29e497d
@nurse nurse authored
Showing with 15 additions and 5 deletions.
  1. +10 −0 ChangeLog
  2. +2 −2 addr2line.c
  3. +2 −2 addr2line.h
  4. +1 −1  vm_dump.c
View
10 ChangeLog
@@ -1,3 +1,13 @@
+Fri Jul 8 21:20:39 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * addr2line.c: use USE_ELF instead of __ELF__ because Solaris
+ doesn't define it. USE_ELF is already provided by configure.
+ patched by Naohisa Goto. [ruby-dev:44066] [Bug #4998]
+
+ * addr2line.h: ditto.
+
+ * vm_dump.c: ditto.
+
Fri Jul 8 16:40:38 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/json/parser/parser.rl (convert_encoding): should not modify
View
4 addr2line.c
@@ -14,7 +14,7 @@
#include <stdio.h>
#include <errno.h>
-#ifdef __ELF__
+#ifdef USE_ELF
#ifdef __OpenBSD__
#include <elf_abi.h>
@@ -605,6 +605,6 @@ rb_dump_backtrace_with_lines(int num_traces, void **trace, char **syms)
free(lines);
}
-#else /* defined(__ELF__) */
+#else /* defined(USE_ELF) */
#error not supported
#endif
View
4 addr2line.h
@@ -11,11 +11,11 @@
#ifndef RUBY_ADDR2LINE_H
#define RUBY_ADDR2LINE_H
-#ifdef __ELF__
+#ifdef USE_ELF
void
rb_dump_backtrace_with_lines(int num_traces, void **traces, char **syms);
-#endif /* __ELF__ */
+#endif /* USE_ELF */
#endif /* RUBY_ADDR2LINE_H */
View
2  vm_dump.c
@@ -797,7 +797,7 @@ rb_vm_bugreport(void)
char **syms = backtrace_symbols(trace, n);
if (syms) {
-#ifdef __ELF__
+#ifdef USE_ELF
rb_dump_backtrace_with_lines(n, trace, syms);
#else
int i;
Please sign in to comment.
Something went wrong with that request. Please try again.