https://git.ruby-lang.org/ruby.git/commit/?id=07b12a1f48

From 07b12a1f4829ca3c7d60d56bb5c89069f0758d4c Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 16 Aug 2021 16:02:49 +0900
Subject: Suppress unused-variable warnings

---
 process.c        | 4 ++--
 thread_pthread.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/process.c b/process.c
index dc2dcf9..22fa8bd 100644
--- a/process.c
+++ b/process.c
@@ -4088,10 +4088,10 @@ struct child_handler_disabler_state https://github.com/ruby/ruby/blob/trunk/process.c#L4088
 static void
 disable_child_handler_before_fork(struct child_handler_disabler_state *old)
 {
+#ifdef HAVE_PTHREAD_SIGMASK
     int ret;
     sigset_t all;
 
-#ifdef HAVE_PTHREAD_SIGMASK
     ret = sigfillset(&all);
     if (ret == -1)
         rb_sys_fail("sigfillset");
@@ -4108,9 +4108,9 @@ disable_child_handler_before_fork(struct child_handler_disabler_state *old) https://github.com/ruby/ruby/blob/trunk/process.c#L4108
 static void
 disable_child_handler_fork_parent(struct child_handler_disabler_state *old)
 {
+#ifdef HAVE_PTHREAD_SIGMASK
     int ret;
 
-#ifdef HAVE_PTHREAD_SIGMASK
     ret = pthread_sigmask(SIG_SETMASK, &old->sigmask, NULL); /* not async-signal-safe */
     if (ret != 0) {
 	rb_syserr_fail(ret, "pthread_sigmask");
diff --git a/thread_pthread.c b/thread_pthread.c
index 36c0b33..15a5ff8 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -765,10 +765,10 @@ get_stack(void **addr, size_t *size) https://github.com/ruby/ruby/blob/trunk/thread_pthread.c#L765
 # endif
 # ifdef HAVE_PTHREAD_ATTR_GETGUARDSIZE
     CHECK_ERR(pthread_attr_getguardsize(&attr, &guard));
-    *size -= guard;
 # else
-    *size -= getpagesize();
+    guard = getpagesize();
 # endif
+    *size -= guard;
     pthread_attr_destroy(&attr);
 #elif defined HAVE_PTHREAD_ATTR_GET_NP /* FreeBSD, DragonFly BSD, NetBSD */
     pthread_attr_t attr;
-- 
cgit v1.1


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