nobu	2008-01-19 11:21:55 +0900 (Sat, 19 Jan 2008)

  New Revision: 15124

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/eval.c
    branches/ruby_1_8/gc.c
    trunk/ChangeLog
    trunk/configure.in
    trunk/eval_intern.h
    trunk/gc.c

  Log:
    * configure.in (sigsetjmp): check if available.
    
    * eval.c, gc.c (setjmp): do not use _setjmp if sigsetjmp is available.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/configure.in?r1=15124&r2=15123&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15124&r2=15123&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15124&r2=15123&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/gc.c?r1=15124&r2=15123&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=15124&r2=15123&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/eval_intern.h?r1=15124&r2=15123&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/gc.c?r1=15124&r2=15123&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/eval.c?r1=15124&r2=15123&diff_format=u

Index: eval_intern.h
===================================================================
--- eval_intern.h	(revision 15123)
+++ eval_intern.h	(revision 15124)
@@ -81,7 +81,7 @@
 #include "vmsruby_private.h"
 #endif
 
-#if !defined(setjmp) && defined(HAVE__SETJMP)
+#if !defined(setjmp) && defined(HAVE__SETJMP) && !defined(HAVE_SIGSETJMP)
 #define ruby_setjmp(env) _setjmp(env)
 #define ruby_longjmp(env,val) _longjmp(env,val)
 #else
Index: configure.in
===================================================================
--- configure.in	(revision 15123)
+++ configure.in	(revision 15124)
@@ -652,7 +652,7 @@
 	      setrgid setegid setregid setresgid issetugid pause lchown lchmod\
 	      getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\
 	      getpriority getrlimit setrlimit sysconf group_member\
-	      dlopen sigprocmask sigaction _setjmp vsnprintf snprintf\
+	      dlopen sigprocmask sigaction sigsetjmp _setjmp vsnprintf snprintf\
 	      setsid telldir seekdir fchmod cosh sinh tanh log2 round\
 	      setuid setgid daemon select_large_fdset setenv unsetenv\
 	      mktime timegm clock_gettime gettimeofday)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15123)
+++ ChangeLog	(revision 15124)
@@ -1,3 +1,9 @@
+Sat Jan 19 11:21:53 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (sigsetjmp): check if available.
+
+	* eval.c, gc.c (setjmp): do not use _setjmp if sigsetjmp is available.
+
 Sat Jan 19 11:10:11 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in: Remove wrong assumptions about Cygwin.  a patch from
Index: gc.c
===================================================================
--- gc.c	(revision 15123)
+++ gc.c	(revision 15124)
@@ -50,7 +50,7 @@
 
 int rb_io_fptr_finalize(struct rb_io_t*);
 
-#if !defined(setjmp) && defined(HAVE__SETJMP)
+#if !defined(setjmp) && defined(HAVE__SETJMP) && !defined(HAVE_SIGSETJMP)
 #define setjmp(env) _setjmp(env)
 #endif
 
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 15123)
+++ ruby_1_8/configure.in	(revision 15124)
@@ -554,7 +554,7 @@
 	      lchown lchmod getpgrp setpgrp getpgid setpgid initgroups\
 	      getgroups setgroups getpriority getrlimit setrlimit sysconf\
 	      group_member dlopen sigprocmask\
-	      sigaction _setjmp setsid telldir seekdir fchmod\
+	      sigaction sigsetjmp _setjmp setsid telldir seekdir fchmod\
 	      mktime timegm gettimeofday\
 	      cosh sinh tanh round setuid setgid setenv unsetenv)
 AC_ARG_ENABLE(setreuid,
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15123)
+++ ruby_1_8/ChangeLog	(revision 15124)
@@ -1,3 +1,9 @@
+Sat Jan 19 11:21:53 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (sigsetjmp): check if available.
+
+	* eval.c, gc.c (setjmp): do not use _setjmp if sigsetjmp is available.
+
 Sat Jan 19 11:10:11 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in: Remove wrong assumptions about Cygwin.  a patch from
Index: ruby_1_8/eval.c
===================================================================
--- ruby_1_8/eval.c	(revision 15123)
+++ ruby_1_8/eval.c	(revision 15124)
@@ -193,7 +193,7 @@
      POST_GETCONTEXT, \
      (j)->status)
 #else
-#  if !defined(setjmp) && defined(HAVE__SETJMP)
+#  if !defined(setjmp) && defined(HAVE__SETJMP) && !defined(HAVE_SIGSETJMP)
 #    define ruby_setjmp(just_before_setjmp, env) \
        ((just_before_setjmp), _setjmp(env))
 #    define ruby_longjmp(env,val) _longjmp(env,val)
Index: ruby_1_8/gc.c
===================================================================
--- ruby_1_8/gc.c	(revision 15123)
+++ ruby_1_8/gc.c	(revision 15124)
@@ -37,7 +37,7 @@
 void re_free_registers _((struct re_registers*));
 void rb_io_fptr_finalize _((struct OpenFile*));
 
-#if !defined(setjmp) && defined(HAVE__SETJMP)
+#if !defined(setjmp) && defined(HAVE__SETJMP) && !defined(HAVE_SIGSETJMP)
 #define setjmp(env) _setjmp(env)
 #endif
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/