naruse	2012-02-09 17:05:21 +0900 (Thu, 09 Feb 2012)

  New Revision: 34512

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34512

  Log:
    merge revision(s) 32875:
    
    * cont.c (HAVE_GETCONTEXT): see getcontext(3) because DragonFly BSD
      x64 port doesn't have it.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/cont.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34511)
+++ ruby_1_9_3/ChangeLog	(revision 34512)
@@ -1,3 +1,8 @@
+Thu Feb  9 17:05:07 2012  NARUSE, Yui  <naruse@r...>
+
+	* cont.c (HAVE_GETCONTEXT): see getcontext(3) because DragonFly BSD
+	  x64 port doesn't have it.
+
 Thu Feb  9 16:19:04 2012  NAKAMURA Usaku  <usa@r...>
 
 	* test/ruby/memory_status.rb (Memory::Win32): 64bit support.
Index: ruby_1_9_3/cont.c
===================================================================
--- ruby_1_9_3/cont.c	(revision 34511)
+++ ruby_1_9_3/cont.c	(revision 34512)
@@ -15,7 +15,7 @@
 #include "gc.h"
 #include "eval_intern.h"
 
-#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) || defined(HAVE_SETCONTEXT)) && !defined(__NetBSD__) && !defined(sun) && !defined(FIBER_USE_NATIVE)
+#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) || (defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT))) && !defined(__NetBSD__) && !defined(sun) && !defined(FIBER_USE_NATIVE)
 #define FIBER_USE_NATIVE 1
 
 /* FIBER_USE_NATIVE enables Fiber performance improvement using system
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34511)
+++ ruby_1_9_3/version.h	(revision 34512)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 74
+#define RUBY_PATCHLEVEL 75
 
 #define RUBY_RELEASE_DATE "2012-02-09"
 #define RUBY_RELEASE_YEAR 2012

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