kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

fix NaCl support

Browse source 
* configure.in: fix function name to be checked, to initialize
  rb_thread_cond_t properly.
* thread_pthread.c (native_cond_initialize, native_cond_destroy):
  fix macro name.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-05-17 14:04:02 +00:00
parent 315a0cb926
commit 7788d102c9
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Thu May 17 23:03:58 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: fix function name to be checked, to initialize
rb_thread_cond_t properly.
* thread_pthread.c (native_cond_initialize, native_cond_destroy):
fix macro name.
Thu May 17 12:53:07 2012 Yuki Yugui Sonoda <yugui@google.com> Thu May 17 12:53:07 2012 Yuki Yugui Sonoda <yugui@google.com>
* thread.c, thread_pthread.c: Moved pthread-specific preprocessor * thread.c, thread_pthread.c: Moved pthread-specific preprocessor

2
configure.in
View file

@ -2005,7 +2005,7 @@ if test x"$enable_pthread" = xyes; then
pthread_getattr_np pthread_attr_get_np pthread_attr_getstack\ pthread_getattr_np pthread_attr_get_np pthread_attr_getstack\
pthread_get_stackaddr_np pthread_get_stacksize_np \ pthread_get_stackaddr_np pthread_get_stacksize_np \
thr_stksegment pthread_stackseg_np pthread_getthrds_np \ thr_stksegment pthread_stackseg_np pthread_getthrds_np \
pthread_cond_initialize pthread_condattr_setclock pthread_condattr_init \ pthread_cond_init pthread_condattr_setclock pthread_condattr_init \
pthread_sigmask) pthread_sigmask)
fi fi
if test x"$ac_cv_header_ucontext_h" = xyes; then if test x"$ac_cv_header_ucontext_h" = xyes; then

4
thread_pthread.c
View file

@ -245,7 +245,7 @@ int pthread_condattr_init(pthread_condattr_t *attr);
static void static void
native_cond_initialize(rb_thread_cond_t *cond, int flags) native_cond_initialize(rb_thread_cond_t *cond, int flags)
{ {
#ifdef HAVE_PTHREAD_COND_INITIALIZE #ifdef HAVE_PTHREAD_COND_INIT
int r; int r;
pthread_condattr_t attr; pthread_condattr_t attr;
@ -273,7 +273,7 @@ native_cond_initialize(rb_thread_cond_t *cond, int flags)
static void static void
native_cond_destroy(rb_thread_cond_t *cond) native_cond_destroy(rb_thread_cond_t *cond)
{ {
#ifdef HAVE_PTHREAD_COND_INITIALIZE #ifdef HAVE_PTHREAD_COND_INIT
int r = pthread_cond_destroy(&cond->cond); int r = pthread_cond_destroy(&cond->cond);
if (r != 0) { if (r != 0) {
rb_bug_errno("pthread_cond_destroy", r); rb_bug_errno("pthread_cond_destroy", r);