3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 38a65f746a..beff20e875 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jan 21 12:50:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c, gc.c (setjmp): sigsetjmp is a macro on cygwin.
+
 Mon Jan 21 12:35:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* transcode.c (transcode_loop, str_transcoding_resize): use unsigned
diff --git a/eval_intern.h b/eval_intern.h
index d9d907aeef..a7b57e86d2 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -81,7 +81,7 @@ char *strrchr(const char *, const char);
 #include "vmsruby_private.h"
 #endif
 
-#if !defined(setjmp) && defined(HAVE__SETJMP) && !defined(HAVE_SIGSETJMP)
+#if !defined(setjmp) && defined(HAVE__SETJMP) && !defined(sigsetjmp) && !defined(HAVE_SIGSETJMP)
 #define ruby_setjmp(env) _setjmp(env)
 #define ruby_longjmp(env,val) _longjmp(env,val)
 #else
diff --git a/gc.c b/gc.c
index 7295cb0b44..fec5802e71 100644
--- a/gc.c
+++ b/gc.c
@@ -50,7 +50,7 @@
 
 int rb_io_fptr_finalize(struct rb_io_t*);
 
-#if !defined(setjmp) && defined(HAVE__SETJMP) && !defined(HAVE_SIGSETJMP)
+#if !defined(setjmp) && defined(HAVE__SETJMP) && !defined(sigsetjmp) && !defined(HAVE_SIGSETJMP)
 #define setjmp(env) _setjmp(env)
 #endif