From 314734add8ad699b1de13c3382e79dca6cca903a Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 11 Apr 2007 07:37:02 +0000 Subject: * win32/win32.[ch] (rb_w32_enter_critical, rb_w32_leave_critical): no need to reject reentrance. removed. * rubysig.h (RUBY_CRITICAL): follow above changes. * rubysig.h (TRAP_BEG, TRAP_END): no need to save errno. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- rubysig.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'rubysig.h') diff --git a/rubysig.h b/rubysig.h index ca68e64206..2df03e415c 100644 --- a/rubysig.h +++ b/rubysig.h @@ -24,19 +24,16 @@ typedef LONG rb_atomic_t; /* Windows doesn't allow interrupt while system calls */ # define TRAP_BEG do {\ - int saved_errno = 0;\ rb_atomic_t trap_immediate = ATOMIC_SET(rb_trap_immediate, 1) # define TRAP_END\ ATOMIC_SET(rb_trap_immediate, trap_immediate);\ - saved_errno = errno;\ - errno = saved_errno;\ } while (0) # define RUBY_CRITICAL(statements) do {\ - rb_w32_enter_critical();\ + rb_atomic_t trap_immediate = ATOMIC_SET(rb_trap_immediate, 0);\ statements;\ - rb_w32_leave_critical();\ + ATOMIC_SET(rb_trap_immediate, trap_immediate);\ } while (0) #else typedef int rb_atomic_t; @@ -47,14 +44,11 @@ typedef int rb_atomic_t; # define ATOMIC_DEC(var) (--(var)) # define TRAP_BEG do {\ - int saved_errno = 0;\ int trap_immediate = rb_trap_immediate;\ rb_trap_immediate = 1 # define TRAP_END \ rb_trap_immediate = trap_immediate;\ - saved_errno = errno;\ - errno = saved_errno;\ } while (0) # define RUBY_CRITICAL(statements) do {\ -- cgit v1.2.3