summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-26 04:49:33 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-26 04:49:33 +0000
commit230be2a7715c55e1b0ff889bb2c77442ff2f0e8c (patch)
tree5ce8b7f706b29e26a8124b8027d9213078ff5ef8
parent93e1583d735bac916ac815ee2737a9596dccad0f (diff)
* vm_dump.c (rb_vm_bugreport): change CrashReporter suggestion messages
on Mac. It should be placed after "-- C level backtrace" line. Suggested by Endoh-san. <before> -- See Crash Report log file under ~/Library/Logs/CrashReporter or --------- -- /Library/Logs/CrashReporter, for the more detail of --------------------- -- C level backtrace information ------------------------------------------- <after> -- C level backtrace information ------------------------------------------- See Crash Report log file under ~/Library/Logs/CrashReporter or /Library/Logs/CrashReporter, for the more detail of. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog17
-rw-r--r--vm_dump.c11
2 files changed, 22 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d6cf30e..865f074 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Sun Jun 26 13:35:35 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * vm_dump.c (rb_vm_bugreport): change CrashReporter suggestion messages
+ on Mac. It should be placed after "-- C level backtrace" line.
+ Suggested by Endoh-san.
+
+ <before>
+ -- See Crash Report log file under ~/Library/Logs/CrashReporter or ---------
+ -- /Library/Logs/CrashReporter, for the more detail of ---------------------
+ -- C level backtrace information -------------------------------------------
+
+ <after>
+ -- C level backtrace information -------------------------------------------
+
+ See Crash Report log file under ~/Library/Logs/CrashReporter or
+ /Library/Logs/CrashReporter, for the more detail of.
+
Sun Jun 26 10:08:28 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
* ext/openssl/extconf.rb
diff --git a/vm_dump.c b/vm_dump.c
index 43ffb06..23143dc 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -779,18 +779,17 @@ rb_vm_bugreport(void)
}
}
-#if defined __MACH__ && defined __APPLE__
- fprintf(stderr, "-- See Crash Report log file under "
- "~/Library/Logs/CrashReporter or ---------\n");
- fprintf(stderr, "-- /Library/Logs/CrashReporter, for "
- "the more detail of ---------------------\n");
-#endif
#if HAVE_BACKTRACE || defined(_WIN32)
fprintf(stderr, "-- C level backtrace information "
"-------------------------------------------\n");
{
#if defined __MACH__ && defined __APPLE__
+ fprintf(stderr, "\n");
+ fprintf(stderr, " See Crash Report log file under "
+ "~/Library/Logs/CrashReporter or\n");
+ fprintf(stderr, " /Library/Logs/CrashReporter, for "
+ "the more detail of.\n");
#elif HAVE_BACKTRACE
#define MAX_NATIVE_TRACE 1024
static void *trace[MAX_NATIVE_TRACE];