summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-01 04:18:02 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-01 04:18:02 +0000
commit35899279e86fdf2a742e49a295058216f7212a10 (patch)
tree213c1f8cb9fe66227580d0165f71078bf52cafbf
parent60b6f22e44f2a172979a5a709dc7f02f2cc5bc43 (diff)
* eval_intern.h (_longjmp): never return. see [ruby-core:23241]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--eval_intern.h7
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d68d1e2..7646df4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri May 1 13:18:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval_intern.h (_longjmp): never return. see [ruby-core:23241]
+
Fri May 1 01:31:19 2009 Tanaka Akira <akr@fsij.org>
* ext/extmk.rb: use RbConfig instead of Config.
diff --git a/eval_intern.h b/eval_intern.h
index a9d29ff..03660a6 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -67,7 +67,12 @@ char *strrchr(const char *, const char);
#define ruby_setjmp(env) RUBY_SETJMP(env)
#define ruby_longjmp(env,val) RUBY_LONGJMP(env,val)
#ifdef __CYGWIN__
-int _setjmp(), _longjmp();
+# ifndef _setjmp
+int _setjmp(jmp_buf);
+# endif
+# ifndef _longjmp
+NORETURN(void _longjmp(jmp_buf, int));
+# endif
#endif
#include <sys/types.h>