summaryrefslogtreecommitdiff
path: root/signal.c
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-06 10:39:57 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-06 10:39:57 +0000
commit2b785b0f3e4f902e7de29a895d1f6ae0f10c3265 (patch)
treebc1801ecbd4d1e852a5ae0a0b8202a41c7ec933b /signal.c
parent23a434b3630b05781dc48e07582ed180d9661a6a (diff)
Merge changes from ruby_1_8 to reduce warnings and potentially improve
security. * mkconfig.rb: hide build path from rbconfig.rb. * util.c (ruby_strtod, dtoa): initialize more variables for error handling. * io.c (rscheck), marshal.c (w_nbyte, w_bytes, w_unique), (path2class, path2module): constified. * pack.c (pack_unpack), process.c (rb_syswait): suppress warnings. * suppress warnings on cygwin, mingw and mswin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'signal.c')
-rw-r--r--signal.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/signal.c b/signal.c
index 90962328ca..fb21fd34fe 100644
--- a/signal.c
+++ b/signal.c
@@ -685,11 +685,13 @@ struct trap_arg {
VALUE sig, cmd;
};
+#if USE_TRAP_MASK
# ifdef HAVE_SIGPROCMASK
static sigset_t trap_last_mask;
# else
static int trap_last_mask;
# endif
+#endif
static RETSIGTYPE sigexit _((int));
static RETSIGTYPE
@@ -991,6 +993,7 @@ install_nativethread_sighandler(signum, handler)
#endif
#endif
+#if defined(SIGCLD) || defined(SIGCHLD)
static void
init_sigchld(sig)
int sig;
@@ -1032,6 +1035,7 @@ init_sigchld(sig)
trap_last_mask = mask;
#endif
}
+#endif
/*
* Many operating systems allow signals to be sent to running