ruby-changes:34588
From: usa <ko1@a...>
Date: Thu, 3 Jul 2014 14:13:18 +0900 (JST)
Subject: [ruby-changes:34588] usa:r46669 (ruby_2_0_0): * thread_pthread.c: fixed compile error on linux.
usa 2014-07-03 14:13:06 +0900 (Thu, 03 Jul 2014) New Revision: 46669 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=46669 Log: * thread_pthread.c: fixed compile error on linux. Modified files: branches/ruby_2_0_0/thread_pthread.c branches/ruby_2_0_0/version.h Index: ruby_2_0_0/thread_pthread.c =================================================================== --- ruby_2_0_0/thread_pthread.c (revision 46668) +++ ruby_2_0_0/thread_pthread.c (revision 46669) @@ -520,6 +520,9 @@ size_t pthread_get_stacksize_np(pthread_ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/thread_pthread.c#L520 # define MAINSTACKADDR_AVAILABLE 0 # endif #endif +#if MAINSTACKADDR_AVAILABLE && !defined(get_main_stack) +# define get_main_stack(addr, size) get_stack(addr, size) +#endif #ifdef STACKADDR_AVAILABLE /* @@ -892,7 +895,12 @@ native_thread_create(rb_thread_t *th) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/thread_pthread.c#L895 thread_debug("create (use cached thread): %p\n", (void *)th); } else { +#ifdef HAVE_PTHREAD_ATTR_INIT pthread_attr_t attr; + pthread_attr_t *const attrp = &attr; +#else + pthread_attr_t *const attrp = NULL; +#endif const size_t stack_size = th->vm->default_params.thread_machine_stack_size; const size_t space = space_size(stack_size); Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 46668) +++ ruby_2_0_0/version.h (revision 46669) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-07-03" -#define RUBY_PATCHLEVEL 511 +#define RUBY_PATCHLEVEL 512 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 7 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/