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

* io.c, eval.c, process.c: add linux to r26371's condition.

Browse source 
patched by Motohiro KOSAKI [ruby-core:28151]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26972 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-03-18 04:52:27 +00:00
parent ae1951a030
commit c50494d6bb
5 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Mar 18 13:51:22 2010 NARUSE, Yui <naruse@ruby-lang.org>
* io.c, eval.c, process.c: add linux to r26371's condition.
patched by Motohiro KOSAKI [ruby-core:28151]
Wed Mar 17 06:39:59 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Mar 17 06:39:59 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.h (rb_warning, rb_sys_warning): fixed typo in rdoc. * ruby.h (rb_warning, rb_sys_warning): fixed typo in rdoc.

2
eval.c
View file

@ -12524,7 +12524,7 @@ rb_thread_start_timer()
safe_mutex_lock(&time_thread.lock); safe_mutex_lock(&time_thread.lock);
if (pthread_create(&time_thread.thread, 0, thread_timer, args) == 0) { if (pthread_create(&time_thread.thread, 0, thread_timer, args) == 0) {
thread_init = 1; thread_init = 1;
#if !defined(__NetBSD__) && !defined(__APPLE__) #if !defined(__NetBSD__) && !defined(__APPLE__) && !defined(linux)
pthread_atfork(0, 0, rb_thread_stop_timer); pthread_atfork(0, 0, rb_thread_stop_timer);
#endif #endif
pthread_cond_wait(&start, &time_thread.lock); pthread_cond_wait(&start, &time_thread.lock);

8
io.c
View file

@ -3270,7 +3270,7 @@ retry:
} }
retry: retry:
#if defined(__NetBSD__) || defined(__APPLE__) #if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
rb_thread_stop_timer(); rb_thread_stop_timer();
#endif #endif
switch ((pid = fork())) { switch ((pid = fork())) {
@ -3300,7 +3300,7 @@ retry:
ruby_sourcefile, ruby_sourceline, pname); ruby_sourcefile, ruby_sourceline, pname);
_exit(127); _exit(127);
} }
#if defined(__NetBSD__) || defined(__APPLE__) #if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
rb_thread_start_timer(); rb_thread_start_timer();
#endif #endif
rb_io_synchronized(RFILE(orig_stdout)->fptr); rb_io_synchronized(RFILE(orig_stdout)->fptr);
@ -3308,7 +3308,7 @@ retry:
return Qnil; return Qnil;
case -1: /* fork failed */ case -1: /* fork failed */
#if defined(__NetBSD__) || defined(__APPLE__) #if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
rb_thread_start_timer(); rb_thread_start_timer();
#endif #endif
if (errno == EAGAIN) { if (errno == EAGAIN) {
@ -3331,7 +3331,7 @@ retry:
break; break;
default: /* parent */ default: /* parent */
#if defined(__NetBSD__) || defined(__APPLE__) #if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
rb_thread_start_timer(); rb_thread_start_timer();
#endif #endif
if (pid < 0) rb_sys_fail(pname); if (pid < 0) rb_sys_fail(pname);

8
process.c
View file

@ -1331,11 +1331,11 @@ rb_f_fork(obj)
fflush(stderr); fflush(stderr);
#endif #endif
#if defined(__NetBSD__) || defined(__APPLE__) #if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
before_exec(); before_exec();
#endif #endif
pid = fork(); pid = fork();
#if defined(__NetBSD__) || defined(__APPLE__) #if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
after_exec(); after_exec();
#endif #endif
switch (pid) { switch (pid) {
@ -1578,7 +1578,7 @@ rb_f_system(argc, argv)
chfunc = signal(SIGCHLD, SIG_DFL); chfunc = signal(SIGCHLD, SIG_DFL);
retry: retry:
#if defined(__NetBSD__) || defined(__APPLE__) #if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
before_exec(); before_exec();
#endif #endif
pid = fork(); pid = fork();
@ -1588,7 +1588,7 @@ rb_f_system(argc, argv)
rb_protect(proc_exec_args, (VALUE)&earg, NULL); rb_protect(proc_exec_args, (VALUE)&earg, NULL);
_exit(127); _exit(127);
} }
#if defined(__NetBSD__) || defined(__APPLE__) #if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
after_exec(); after_exec();
#endif #endif
if (pid < 0) { if (pid < 0) {

6
version.h
View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.8" #define RUBY_VERSION "1.8.8"
#define RUBY_RELEASE_DATE "2010-03-17" #define RUBY_RELEASE_DATE "2010-03-18"
#define RUBY_VERSION_CODE 188 #define RUBY_VERSION_CODE 188
#define RUBY_RELEASE_CODE 20100317 #define RUBY_RELEASE_CODE 20100318
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 8 #define RUBY_VERSION_TEENY 8
#define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 17 #define RUBY_RELEASE_DAY 18
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];