naruse	2011-07-08 21:23:10 +0900 (Fri, 08 Jul 2011)

  New Revision: 32461

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32461

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/addr2line.c
    trunk/addr2line.h
    trunk/vm_dump.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32460)
+++ ChangeLog	(revision 32461)
@@ -1,3 +1,13 @@
+Fri Jul  8 21:20:39 2011  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* ext/json/parser/parser.rl (convert_encoding): should not modify
Index: addr2line.c
===================================================================
--- addr2line.c	(revision 32460)
+++ addr2line.c	(revision 32461)
@@ -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 @@
     free(lines);
 }
 
-#else /* defined(__ELF__) */
+#else /* defined(USE_ELF) */
 #error not supported
 #endif
Index: addr2line.h
===================================================================
--- addr2line.h	(revision 32460)
+++ addr2line.h	(revision 32461)
@@ -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 */
Index: vm_dump.c
===================================================================
--- vm_dump.c	(revision 32460)
+++ vm_dump.c	(revision 32461)
@@ -797,7 +797,7 @@
 	char **syms = backtrace_symbols(trace, n);
 
 	if (syms) {
-#ifdef __ELF__
+#ifdef USE_ELF
 	    rb_dump_backtrace_with_lines(n, trace, syms);
 #else
 	    int i;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/