summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-20 14:34:12 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-20 14:34:12 +0000
commit3ae3c424ceb6d464a6cd8a24e7e32e34bd01e774 (patch)
tree85d1ac7a1f40a75de2843cd625578ec0299a2580
parent807c13cc61a04f5393dfa1a4a31e468d00678e84 (diff)
* thread_pthread.c (native_cond_initialize): destroy condattr
after using it. Patch by Stanislav Sedov. Thank you. [Bug #7041] [ruby-core:47619] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--thread_pthread.c1
-rw-r--r--version.h6
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index aff89ab22e..9f4869da9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 20 10:23:37 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread_pthread.c (native_cond_initialize): destroy condattr
+ after using it. Patch by Stanislav Sedov. Thank you.
+ [Bug #7041] [ruby-core:47619]
+
Sun Sep 9 23:01:43 2012 Tanaka Akira <akr@fsij.org>
* ext/zlib/extconf.rb: detect z_crc_t type which will be defined
diff --git a/thread_pthread.c b/thread_pthread.c
index 6659972d97..b290677e3d 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -248,6 +248,7 @@ native_cond_initialize(rb_thread_cond_t *cond, int flags)
#endif
r = pthread_cond_init(&cond->cond, &attr);
+ pthread_condattr_destroy(&attr);
if (r != 0) {
rb_bug_errno("pthread_cond_init", r);
}
diff --git a/version.h b/version.h
index dbb7839a89..00d671d291 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 269
+#define RUBY_PATCHLEVEL 270
-#define RUBY_RELEASE_DATE "2012-09-09"
+#define RUBY_RELEASE_DATE "2012-09-20"
#define RUBY_RELEASE_YEAR 2012
#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 20
#include "ruby/version.h"