naruse	2014-02-22 08:32:34 +0900 (Sat, 22 Feb 2014)

  New Revision: 45090

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45090

  Log:
    merge revision(s) 44925: [Backport #9492]
    
    * configure.in: check if pthread_setname_np is available.
    
    * thread_pthread.c: pthread_setname_np is not available on old
      Darwins.  [ruby-core:60524] [Bug #9492]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/thread_pthread.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 45089)
+++ ruby_2_1/configure.in	(revision 45090)
@@ -2448,7 +2448,7 @@ if test x"$enable_pthread" = xyes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L2448
 	pthread_get_stackaddr_np pthread_get_stacksize_np \
 	thr_stksegment pthread_stackseg_np pthread_getthrds_np \
 	pthread_cond_init pthread_condattr_setclock pthread_condattr_init \
-        pthread_sigmask)
+	pthread_sigmask pthread_setname_np)
     if test "${host_os}" = "nacl"; then
       ac_cv_func_pthread_attr_init=no
     else
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45089)
+++ ruby_2_1/ChangeLog	(revision 45090)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sat Feb 22 01:35:02 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: check if pthread_setname_np is available.
+
+	* thread_pthread.c: pthread_setname_np is not available on old
+	  Darwins.  [ruby-core:60524] [Bug #9492]
+
 Sat Feb 22 00:21:50 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (local_push_gen, local_pop_gen): save cmdarg_stack to
Index: ruby_2_1/thread_pthread.c
===================================================================
--- ruby_2_1/thread_pthread.c	(revision 45089)
+++ ruby_2_1/thread_pthread.c	(revision 45090)
@@ -1423,7 +1423,7 @@ timer_thread_sleep(rb_global_vm_lock_t* https://github.com/ruby/ruby/blob/trunk/ruby_2_1/thread_pthread.c#L1423
 
 #if defined(__linux__) && defined(PR_SET_NAME)
 # define SET_THREAD_NAME(name) prctl(PR_SET_NAME, name)
-#elif defined(__APPLE__)
+#elif defined(HAVE_PTHREAD_SETNAME_NP)
 /* pthread_setname_np() on Darwin does not have target thread argument */
 # define SET_THREAD_NAME(name) pthread_setname_np(name)
 #else
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45089)
+++ ruby_2_1/version.h	(revision 45090)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 49
+#define RUBY_PATCHLEVEL 50
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44925


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/