2 files changed, 6 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 1877d5b9f9..76ff1a25cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 22 03:53:05 2010  Satoshi Shiba  <shiba@rvm.jp>
+
+	* cont.c (fiber_setcontext): Use swapcontext() instead longjmp().
+	[ruby-dev:41316] [Bug #3295]
+
 Fri May 21 19:11:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/nkf/nkf.c (rb_nkf_convert, rb_nkf_guess): check too huge
diff --git a/cont.c b/cont.c
index c0c361920e..dec3b01908 100644
--- a/cont.c
+++ b/cont.c
@@ -621,16 +621,7 @@ fiber_setcontext(rb_fiber_t *newfib, rb_fiber_t *oldfib)
 #ifdef _WIN32
     SwitchToFiber(newfib->fib_handle);
 #else
-    if (!ruby_setjmp(oldfib->cont.jmpbuf)) {
-	if (newfib->status != RUNNING) {
-	    if (setcontext(&newfib->context) < 0) {
-		rb_bug("context switch between fiber failed");
-	    }
-	}
-	else {
-	    ruby_longjmp(newfib->cont.jmpbuf, 1);
-	}
-    }
+    swapcontext(&oldfib->context, &newfib->context);
 #endif
 }
 #endif