summaryrefslogtreecommitdiff
path: root/signal.c
diff options
context:
space:
mode:
authoruema2 <uema2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-15 03:18:08 +0000
committeruema2 <uema2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-15 03:18:08 +0000
commitb19e36a214a864572baee3643ddb369cfeb94d77 (patch)
tree5bd7fecbef75dd74f4810cda212bf989f43a95a3 /signal.c
parentc476b6e05c1cae6de5d24b823e676566ae27de6c (diff)
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c, process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h, bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h, ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c, ext/socket/getnameinfo.c, ext/socket/socket.c, ext/tcltklib/stubs.c : replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER * wince/exe.mak : delete \r at the end of lines. * wince/mswince-ruby17.def : delete rb_obj_become git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'signal.c')
-rw-r--r--signal.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/signal.c b/signal.c
index d9b5d9b5b4..44ada105dc 100644
--- a/signal.c
+++ b/signal.c
@@ -369,7 +369,7 @@ static RETSIGTYPE
sighandler(sig)
int sig;
{
-#if defined(NT) || defined(_WIN32_WCE)
+#ifdef _WIN32
#define IN_MAIN_CONTEXT(f, a) (rb_w32_main_context(a, f) ? (void)0 : f(a))
#else
#define IN_MAIN_CONTEXT(f, a) f(a)
@@ -453,7 +453,7 @@ rb_trap_exec()
}
struct trap_arg {
-#if !defined(NT) && !defined(_WIN32_WCE)
+#ifndef _WIN32
# ifdef HAVE_SIGPROCMASK
sigset_t mask;
# else
@@ -594,7 +594,7 @@ trap(arg)
trap_list[sig] = command;
/* enable at least specified signal. */
-#if !defined(NT) && !defined(_WIN32_WCE)
+#ifndef _WIN32
#ifdef HAVE_SIGPROCMASK
sigdelset(&arg->mask, sig);
#else
@@ -604,7 +604,7 @@ trap(arg)
return old;
}
-#if !defined(NT) && !defined(_WIN32_WCE)
+#ifndef _WIN32
static VALUE
trap_ensure(arg)
struct trap_arg *arg;
@@ -623,7 +623,7 @@ trap_ensure(arg)
void
rb_trap_restore_mask()
{
-#if !defined(NT) && !defined(_WIN32_WCE)
+#ifndef _WIN32
# ifdef HAVE_SIGPROCMASK
sigprocmask(SIG_SETMASK, &trap_last_mask, NULL);
# else
@@ -655,7 +655,7 @@ sig_trap(argc, argv)
if (OBJ_TAINTED(arg.cmd)) {
rb_raise(rb_eSecurityError, "Insecure: tainted signal trap");
}
-#if !defined(NT) && !defined(_WIN32_WCE)
+#ifndef _WIN32
/* disable interrupt */
# ifdef HAVE_SIGPROCMASK
sigfillset(&arg.mask);