nagachika	2013-04-20 01:54:51 +0900 (Sat, 20 Apr 2013)

  New Revision: 40385

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

  Log:
    merge revision(s) 40103: [Backport #8235]
    
    * thread_pthread.c: Fixes wrong scopes of #if USE_SLEEPY_TIMER_THREAD
      .. #endif sections.  This fixes a build error on NativeClient.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/thread_pthread.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40384)
+++ ruby_2_0_0/ChangeLog	(revision 40385)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Apr 20 01:47:31 2013  Yuki Yugui Sonoda  <yugui@g...>
+
+	* thread_pthread.c: Fixes wrong scopes of #if USE_SLEEPY_TIMER_THREAD
+	  .. #endif sections.  This fixes a build error on NativeClient.
+
 Sat Apr 20 01:31:38 2013  NARUSE, Yui  <naruse@r...>
 
 	* Merge Onigmo 5.13.4 f22cf2e566712cace60d17f84d63119d7c5764ee.
Index: ruby_2_0_0/thread_pthread.c
===================================================================
--- ruby_2_0_0/thread_pthread.c	(revision 40384)
+++ ruby_2_0_0/thread_pthread.c	(revision 40385)
@@ -1240,7 +1240,6 @@ close_communication_pipe(int pipes[2]) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/thread_pthread.c#L1240
     pipes[0] = pipes[1] = -1;
 }
 
-#if USE_SLEEPY_TIMER_THREAD
 static void
 set_nonblock(int fd)
 {
@@ -1255,9 +1254,7 @@ set_nonblock(int fd) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/thread_pthread.c#L1254
     if (err == -1)
 	rb_sys_fail(0);
 }
-#endif
 
-#if USE_SLEEPY_TIMER_THREAD
 static void
 setup_communication_pipe_internal(int pipes[2])
 {
@@ -1277,13 +1274,11 @@ setup_communication_pipe_internal(int pi https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/thread_pthread.c#L1274
     set_nonblock(pipes[0]);
     set_nonblock(pipes[1]);
 }
-#endif /* USE_SLEEPY_TIMER_THREAD */
 
 /* communication pipe with timer thread and signal handler */
 static void
 setup_communication_pipe(void)
 {
-#if USE_SLEEPY_TIMER_THREAD
     if (timer_thread_pipe_owner_process == getpid()) {
 	/* already set up. */
 	return;
@@ -1293,7 +1288,6 @@ setup_communication_pipe(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/thread_pthread.c#L1288
 
     /* validate pipe on this process */
     timer_thread_pipe_owner_process = getpid();
-#endif /* USE_SLEEPY_TIMER_THREAD */
 }
 
 /**
@@ -1348,6 +1342,7 @@ timer_thread_sleep(rb_global_vm_lock_t* https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/thread_pthread.c#L1342
 #else /* USE_SLEEPY_TIMER_THREAD */
 # define PER_NANO 1000000000
 void rb_thread_wakeup_timer_thread(void) {}
+static void rb_thread_wakeup_timer_thread_low(void) {}
 
 static pthread_mutex_t timer_thread_lock;
 static rb_thread_cond_t timer_thread_cond;
@@ -1430,7 +1425,9 @@ rb_thread_create_timer_thread(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/thread_pthread.c#L1425
 # endif
 #endif
 
+#if USE_SLEEPY_TIMER_THREAD
 	setup_communication_pipe();
+#endif /* USE_SLEEPY_TIMER_THREAD */
 
 	/* create timer thread */
 	if (timer_thread_id) {
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40384)
+++ ruby_2_0_0/version.h	(revision 40385)
@@ -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 "2013-04-20"
-#define RUBY_PATCHLEVEL 150
+#define RUBY_PATCHLEVEL 151
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40103


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