summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-03 16:56:49 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-03 16:56:49 +0000
commitc0876125f53f71348bf1b83b88cdf20d07a722c0 (patch)
tree2337cb64663646827522f6608527493c26afdb78
parentaf65d1af17f64d13765fa3e38a4ac3e1b6f0181b (diff)
downloadruby-c0876125f53f71348bf1b83b88cdf20d07a722c0.tar.gz
ruby-c0876125f53f71348bf1b83b88cdf20d07a722c0.tar.xz
ruby-c0876125f53f71348bf1b83b88cdf20d07a722c0.zip
* include/ruby/intern.h (rb_mutex_synchronize): fixed prototype.
* thread.c (rb_mutex_synchronize): fixed function name. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20102 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--include/ruby/intern.h2
-rw-r--r--thread.c2
-rw-r--r--version.h6
4 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ea776b2f5..7cb41e571 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 4 01:56:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/intern.h (rb_mutex_synchronize): fixed prototype.
+
+ * thread.c (rb_mutex_synchronize): fixed function name.
+
Mon Nov 3 16:32:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* missing.h: needs RUBY_EXTERN instead of extern for mswin.
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index ada1ec094..739ff1e83 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -676,7 +676,7 @@ VALUE rb_mutex_try_lock(VALUE mutex);
VALUE rb_mutex_lock(VALUE mutex);
VALUE rb_mutex_unlock(VALUE mutex);
VALUE rb_mutex_sleep(VALUE self, VALUE timeout);
-VALUE rb_mutex_synchronize(VALUE self);
+VALUE rb_mutex_synchronize(VALUE mutex, VALUE (*func)(VALUE arg), VALUE arg);
VALUE rb_barrier_new(void);
VALUE rb_barrier_wait(VALUE self);
VALUE rb_barrier_release(VALUE self);
diff --git a/thread.c b/thread.c
index 2407bf8d0..7e4e280f0 100644
--- a/thread.c
+++ b/thread.c
@@ -3023,7 +3023,7 @@ mutex_sleep(int argc, VALUE *argv, VALUE self)
*/
VALUE
-rb_thread_synchronize(VALUE mutex, VALUE (*func)(VALUE arg), VALUE arg)
+rb_mutex_synchronize(VALUE mutex, VALUE (*func)(VALUE arg), VALUE arg)
{
rb_mutex_lock(mutex);
return rb_ensure(func, arg, rb_mutex_unlock, mutex);
diff --git a/version.h b/version.h
index 5f5b18bd6..e9036c7e5 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-11-03"
+#define RUBY_RELEASE_DATE "2008-11-04"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20081103
+#define RUBY_RELEASE_CODE 20081104
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 4
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];