From df535c3515bd8a06e9dd64c14bc1bdf747d5bb12 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 11 May 2009 15:06:17 +0000
Subject: merges r23317 from trunk into ruby_1_9_1. -- * eval_intern.h
 (_longjmp): never return.  see [ruby-core:23241]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog     | 4 ++++
 eval_intern.h | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d2a58a862..f81d730d0 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]
+
 Sun Apr 26 20:33:12 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* tool/transcode-tb (ActionMap#generate_node):
diff --git a/eval_intern.h b/eval_intern.h
index 13d2d2b0c..7d0cf3274 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>
-- 
cgit