2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 83ca30336c..8125fd9bfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 16 16:26:09 2014  Eric Wong  <e@80x24.org>
+
+	* cont.c (fiber_store): fix WIN32 fibers
+	  [ruby-core:65745] [ruby-core:65758]
+
 Thu Oct 16 15:05:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (parser_here_document): do not append already appended
diff --git a/cont.c b/cont.c
index 739ec8064f..08acf40821 100644
--- a/cont.c
+++ b/cont.c
@@ -1366,10 +1366,10 @@ fiber_store(rb_fiber_t *next_fib, rb_thread_t *th)
 	terminated_machine_stack.ptr = NULL;
 	terminated_machine_stack.size = 0;
     }
+#endif /* not _WIN32 */
     fib = th->fiber;
     if (fib->cont.argc == -1) rb_exc_raise(fib->cont.value);
     return fib->cont.value;
-#endif /* not _WIN32 */
 
 #else /* FIBER_USE_NATIVE */
     cont_save_machine_stack(th, &fib->cont);