kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

error.c: moved

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-01-13 03:24:22 +00:00
parent 81cb9aa574
commit c2c0157040
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
error.c
View file

@ -24,6 +24,10 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#if defined __APPLE__
# include <AvailabilityMacros.h>
#endif
#ifndef EXIT_SUCCESS #ifndef EXIT_SUCCESS
#define EXIT_SUCCESS 0 #define EXIT_SUCCESS 0
#endif #endif
@ -371,8 +375,10 @@ preface_dump(FILE *out)
"-- Crash Report log information " "-- Crash Report log information "
"--------------------------------------------\n" "--------------------------------------------\n"
" See Crash Report log file under the one of following:\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"
" * /Library/Logs/CrashReporter\n" " * /Library/Logs/CrashReporter\n"
# endif
" * ~/Library/Logs/DiagnosticReports\n" " * ~/Library/Logs/DiagnosticReports\n"
" * /Library/Logs/DiagnosticReports\n" " * /Library/Logs/DiagnosticReports\n"
" for more details.\n" " for more details.\n"
@ -391,8 +397,14 @@ postscript_dump(FILE *out)
{ {
#if defined __APPLE__ #if defined __APPLE__
static const char msg[] = "" static const char msg[] = ""
"[IMPORTANT]\n" "[IMPORTANT]"
"Don't forget to include the Crash Report log file in bug reports.\n" /*" ------------------------------------------------"*/
"\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"; "\n";
const size_t msglen = sizeof(msg) - 1; const size_t msglen = sizeof(msg) - 1;
#else #else

2
test/ruby/test_rubyoptions.rb
View file

@ -589,7 +589,7 @@ class TestRubyOptions < Test::Unit::TestCase
\n \n
(?: (?:
\[IMPORTANT\]\n \[IMPORTANT\]\n
.*\n (?:.+\n)+
\n \n
)? )?
)x, )x,