yugui	2013-04-04 17:01:27 +0900 (Thu, 04 Apr 2013)

  New Revision: 40103

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

  Log:
    * thread_pthread.c: Fixes wrong scopes of #if USE_SLEEPY_TIMER_THREAD
      .. #endif sections.  This fixes a build error on NativeClient.

  Modified files:
    trunk/ChangeLog
    trunk/thread_pthread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40102)
+++ ChangeLog	(revision 40103)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Apr  4 16:51:29 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.
+
 Wed Apr  3 17:25:31 2013  Yuki Yugui Sonoda  <yugui@g...>
 
 	* thread_pthread.c (ruby_init_stack): Avoid using uninitialized value.
Index: thread_pthread.c
===================================================================
--- thread_pthread.c	(revision 40102)
+++ thread_pthread.c	(revision 40103)
@@ -1241,7 +1241,6 @@ close_communication_pipe(int pipes[2]) https://github.com/ruby/ruby/blob/trunk/thread_pthread.c#L1241
     pipes[0] = pipes[1] = -1;
 }
 
-#if USE_SLEEPY_TIMER_THREAD
 static void
 set_nonblock(int fd)
 {
@@ -1256,9 +1255,7 @@ set_nonblock(int fd) https://github.com/ruby/ruby/blob/trunk/thread_pthread.c#L1255
     if (err == -1)
 	rb_sys_fail(0);
 }
-#endif
 
-#if USE_SLEEPY_TIMER_THREAD
 static void
 setup_communication_pipe_internal(int pipes[2])
 {
@@ -1278,13 +1275,11 @@ setup_communication_pipe_internal(int pi https://github.com/ruby/ruby/blob/trunk/thread_pthread.c#L1275
     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;
@@ -1294,7 +1289,6 @@ setup_communication_pipe(void) https://github.com/ruby/ruby/blob/trunk/thread_pthread.c#L1289
 
     /* validate pipe on this process */
     timer_thread_pipe_owner_process = getpid();
-#endif /* USE_SLEEPY_TIMER_THREAD */
 }
 
 /**
@@ -1349,6 +1343,7 @@ timer_thread_sleep(rb_global_vm_lock_t* https://github.com/ruby/ruby/blob/trunk/thread_pthread.c#L1343
 #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;
@@ -1431,7 +1426,9 @@ rb_thread_create_timer_thread(void) https://github.com/ruby/ruby/blob/trunk/thread_pthread.c#L1426
 # endif
 #endif
 
+#if USE_SLEEPY_TIMER_THREAD
 	setup_communication_pipe();
+#endif /* USE_SLEEPY_TIMER_THREAD */
 
 	/* create timer thread */
 	if (timer_thread_id) {

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