summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-21 03:50:14 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-21 03:50:14 +0000
commitae6eeb20ef7656eabca44c1096ed7f1764a73880 (patch)
tree97dd7b169be316a99be39d5fd7d76167f63e311f
parent379da00d152236571b01806499346f816b3551a5 (diff)
downloadruby-ae6eeb20ef7656eabca44c1096ed7f1764a73880.tar.gz
ruby-ae6eeb20ef7656eabca44c1096ed7f1764a73880.tar.xz
ruby-ae6eeb20ef7656eabca44c1096ed7f1764a73880.zip
* eval.c, gc.c (setjmp): sigsetjmp is a macro on cygwin.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--eval_intern.h2
-rw-r--r--gc.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 38a65f746..beff20e87 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 d9d907aee..a7b57e86d 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 7295cb0b4..fec5802e7 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