nobu	2017-01-13 12:24:22 +0900 (Fri, 13 Jan 2017)

  New Revision: 57318

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57318

  Log:
    error.c: moved
    
    * error.c (preface_dump, postscript_dump): CrashReporter directory
      was used before Mac OS X 10.6.

  Modified files:
    trunk/error.c
    trunk/test/ruby/test_rubyoptions.rb
Index: test/ruby/test_rubyoptions.rb
===================================================================
--- test/ruby/test_rubyoptions.rb	(revision 57317)
+++ test/ruby/test_rubyoptions.rb	(revision 57318)
@@ -589,7 +589,7 @@ class TestRubyOptions < Test::Unit::Test https://github.com/ruby/ruby/blob/trunk/test/ruby/test_rubyoptions.rb#L589
         \n
         (?:
           \[IMPORTANT\]\n
-          .*\n
+          (?:.+\n)+
           \n
         )?
       )x,
Index: error.c
===================================================================
--- error.c	(revision 57317)
+++ error.c	(revision 57318)
@@ -24,6 +24,10 @@ https://github.com/ruby/ruby/blob/trunk/error.c#L24
 #include <unistd.h>
 #endif
 
+#if defined __APPLE__
+# include <AvailabilityMacros.h>
+#endif
+
 #ifndef EXIT_SUCCESS
 #define EXIT_SUCCESS 0
 #endif
@@ -371,8 +375,10 @@ preface_dump(FILE *out) https://github.com/ruby/ruby/blob/trunk/error.c#L375
 	"-- Crash Report log information "
 	"--------------------------------------------\n"
 	"   See Crash Report log file under the one of following:\n"
+# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
 	"     * ~/Library/Logs/CrashReporter\n"
 	"     * /Library/Logs/CrashReporter\n"
+# endif
 	"     * ~/Library/Logs/DiagnosticReports\n"
 	"     * /Library/Logs/DiagnosticReports\n"
 	"   for more details.\n"
@@ -391,8 +397,14 @@ postscript_dump(FILE *out) https://github.com/ruby/ruby/blob/trunk/error.c#L397
 {
 #if defined __APPLE__
     static const char msg[] = ""
-	"[IMPORTANT]\n"
-	"Don't forget to include the Crash Report log file in bug reports.\n"
+	"[IMPORTANT]"
+	/*" ------------------------------------------------"*/
+	"\n""Don't forget to include the Crash Report log file under\n"
+# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
+	"CrashReporter or "
+# endif
+	"DiagnosticReports directory in bug reports.\n"
+	/*"------------------------------------------------------------\n"*/
 	"\n";
     const size_t msglen = sizeof(msg) - 1;
 #else

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