* thread.c (thread_create_core): block is not used if first_func

  is given.


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

3 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 91fbba5f5f..a8575ff09e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 20 01:02:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_create_core): block is not used if first_func
+	  is given.
+
 Mon Mar 19 16:58:52 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* missing/{strlcat,strlcpy}.c, missing.h: new functions.
diff --git a/thread.c b/thread.c
index 8c689bd5d1..78471c28ee 100644
--- a/thread.c
+++ b/thread.c
@@ -341,7 +341,7 @@ thread_create_core(VALUE klass, VALUE args, VALUE (*fn)(ANYARGS), void *arg)
 
     /* setup thread environment */
     th->first_args = args;
-    th->first_proc = rb_block_proc();
+    th->first_proc = fn ? Qfalse : rb_block_proc();
     th->first_func = fn;
     th->first_func_arg = arg;
 
diff --git a/version.h b/version.h
index 709ec862dc..3a23002b20 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-03-19"
+#define RUBY_RELEASE_DATE "2007-03-20"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070319
+#define RUBY_RELEASE_CODE 20070320
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 20
 
 RUBY_EXTERN const char ruby_version[];
 RUBY_EXTERN const char ruby_release_date[];