summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--thread_pthread.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 46437f1ca6..012fed8562 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun 11 06:17:06 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * thread_pthread.c (native_cond_initialize): fix typo in r36022.
+ this cause a failure on FreeBSD 8.2 amd64.
+ http://fbsd.rubyci.org/~chkbuild/ruby-trunk/log/20120610T130201Z.diff.html.gz
+
Mon Jun 11 05:21:57 2012 Koichi Sasada <ko1@atdot.net>
* .gdbinit (SDR): add SDR function. It's only for VM debugging.
diff --git a/thread_pthread.c b/thread_pthread.c
index f434d16922..332e97be21 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -248,7 +248,7 @@ native_cond_initialize(rb_thread_cond_t *cond, int flags)
{
#ifdef HAVE_PTHREAD_COND_INIT
int r;
-# ifdef HAVE_PTHREAD_COND_ATTR_INIT
+# ifdef HAVE_PTHREAD_CONDATTR_INIT
pthread_condattr_t attr;
pthread_condattr_init(&attr);