fixed merge mistake at r44766.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 4 deletions

diff --git a/process.c b/process.c
index e3bee49ae7..0c19d58122 100644
--- a/process.c
+++ b/process.c
@@ -4915,13 +4915,14 @@ rb_daemon(int nochdir, int noclose)
     before_fork();
     err = daemon(nochdir, noclose);
     after_fork();
+    rb_thread_atfork();
 #else
     int n;
 
 #define fork_daemon() \
     switch (rb_fork(0, 0, 0, Qnil)) { \
       case -1: return -1; \
-      case 0:  break; \
+      case 0:  rb_thread_atfork(); break; \
       default: _exit(EXIT_SUCCESS); \
     }
 
diff --git a/version.h b/version.h
index 4f92408e40..f029f971a5 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #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_MONTH 1
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_DAY 31
 
 #include "ruby/version.h"