archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fixed merge mistake at r44766.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2014-01-31 12:58:39 +00:00
parent 75c84da28c
commit c04e6e6e61
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
process.c
View file

@ -4915,13 +4915,14 @@ rb_daemon(int nochdir, int noclose)
before_fork(); before_fork();
err = daemon(nochdir, noclose); err = daemon(nochdir, noclose);
after_fork(); after_fork();
rb_thread_atfork();
#else #else
int n; int n;
#define fork_daemon() \ #define fork_daemon() \
switch (rb_fork(0, 0, 0, Qnil)) { \ switch (rb_fork(0, 0, 0, Qnil)) { \
case -1: return -1; \ case -1: return -1; \
case 0: break; \ case 0: rb_thread_atfork(); break; \
default: _exit(EXIT_SUCCESS); \ default: _exit(EXIT_SUCCESS); \
} }

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 510 #define RUBY_PATCHLEVEL 511
#define RUBY_RELEASE_DATE "2014-01-30" #define RUBY_RELEASE_DATE "2014-01-31"
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 30 #define RUBY_RELEASE_DAY 31
#include "ruby/version.h" #include "ruby/version.h"