[ruby-oci8-commit] [410] trunk/ruby-oci8/ext/oci8: * ext/oci8/env.c: fix for rubinius.

[nobody at rubyforge.org]

Revision: 410
Author:   kubo
Date:     2010-08-28 05:26:45 -0400 (Sat, 28 Aug 2010)

Log Message:
-----------
* ext/oci8/env.c: fix for rubinius.

Modified Paths:
--------------
    branches/ruby-oci8-2.0/ChangeLog
    branches/ruby-oci8-2.0/ext/oci8/env.c
    trunk/ruby-oci8/ChangeLog
    trunk/ruby-oci8/ext/oci8/env.c

Modified: branches/ruby-oci8-2.0/ChangeLog
===================================================================
--- branches/ruby-oci8-2.0/ChangeLog	2010-08-28 09:02:01 UTC (rev 409)
+++ branches/ruby-oci8-2.0/ChangeLog	2010-08-28 09:26:45 UTC (rev 410)
@@ -1,4 +1,7 @@
 2010-08-28  KUBO Takehiro  <kubo at jiubao.org>
+	* ext/oci8/env.c: fix for rubinius.
+
+2010-08-28  KUBO Takehiro  <kubo at jiubao.org>
 	* ext/oci8/env.c, ext/oci8/error.c, ext/oci8/extconf.rb, ext/oci8/oci8.c,
 	  ext/oci8/oci8.h, oci8/oci8lib.c, ext/oci8/ocinumber.c: fix for rubinius.
 	    Note that this is not enough to compile ruby-oci8 on it.

Modified: branches/ruby-oci8-2.0/ext/oci8/env.c
===================================================================
--- branches/ruby-oci8-2.0/ext/oci8/env.c	2010-08-28 09:02:01 UTC (rev 409)
+++ branches/ruby-oci8-2.0/ext/oci8/env.c	2010-08-28 09:26:45 UTC (rev 410)
@@ -23,7 +23,7 @@
 #include <ruby/util.h>
 #endif
 
-#ifdef RUBY_VM
+#ifdef HAVE_TYPE_RB_BLOCKING_FUNCTION_T
 ub4 oci8_env_mode = OCI_OBJECT | OCI_THREADED;
 #else
 ub4 oci8_env_mode = OCI_OBJECT;
@@ -42,7 +42,7 @@
     return oci8_global_envhp;
 }
 
-#ifdef RUBY_VM
+#ifdef HAVE_TYPE_RB_BLOCKING_FUNCTION_T
 /*
  * oci8_errhp is a thread local object in ruby 1.9.
  */
@@ -97,11 +97,11 @@
 
 void Init_oci8_env(void)
 {
-#ifdef RUBY_VM
+#ifdef HAVE_TYPE_RB_BLOCKING_FUNCTION_T
     int error;
 #endif
 
-#if !defined(RUBY_VM) && !defined(_WIN32)
+#if !defined(HAVE_TYPE_RB_BLOCKING_FUNCTION_T) && !defined(_WIN32)
     /* workaround code.
      *
      * Some instant clients set the environment variables
@@ -147,7 +147,7 @@
         }
     }
 
-#ifdef RUBY_VM
+#ifdef HAVE_TYPE_RB_BLOCKING_FUNCTION_T
     id_thread_key = rb_intern("__oci8_errhp__");
     error = oci8_tls_key_init(&oci8_tls_key);
     if (error != 0) {

Modified: trunk/ruby-oci8/ChangeLog
===================================================================
--- trunk/ruby-oci8/ChangeLog	2010-08-28 09:02:01 UTC (rev 409)
+++ trunk/ruby-oci8/ChangeLog	2010-08-28 09:26:45 UTC (rev 410)
@@ -1,4 +1,7 @@
 2010-08-28  KUBO Takehiro  <kubo at jiubao.org>
+	* ext/oci8/env.c: fix for rubinius.
+
+2010-08-28  KUBO Takehiro  <kubo at jiubao.org>
 	* ext/oci8/env.c, ext/oci8/error.c, ext/oci8/extconf.rb, ext/oci8/oci8.c,
 	  ext/oci8/oci8.h, oci8/oci8lib.c, ext/oci8/ocinumber.c: fix for rubinius.
 	    Note that this is not enough to compile ruby-oci8 on it.

Modified: trunk/ruby-oci8/ext/oci8/env.c
===================================================================
--- trunk/ruby-oci8/ext/oci8/env.c	2010-08-28 09:02:01 UTC (rev 409)
+++ trunk/ruby-oci8/ext/oci8/env.c	2010-08-28 09:26:45 UTC (rev 410)
@@ -23,7 +23,7 @@
 #include <ruby/util.h>
 #endif
 
-#ifdef RUBY_VM
+#ifdef HAVE_TYPE_RB_BLOCKING_FUNCTION_T
 ub4 oci8_env_mode = OCI_OBJECT | OCI_THREADED;
 #else
 ub4 oci8_env_mode = OCI_OBJECT;
@@ -42,7 +42,7 @@
     return oci8_global_envhp;
 }
 
-#ifdef RUBY_VM
+#ifdef HAVE_TYPE_RB_BLOCKING_FUNCTION_T
 /*
  * oci8_errhp is a thread local object in ruby 1.9.
  */
@@ -97,11 +97,11 @@
 
 void Init_oci8_env(void)
 {
-#ifdef RUBY_VM
+#ifdef HAVE_TYPE_RB_BLOCKING_FUNCTION_T
     int error;
 #endif
 
-#if !defined(RUBY_VM) && !defined(_WIN32)
+#if !defined(HAVE_TYPE_RB_BLOCKING_FUNCTION_T) && !defined(_WIN32)
     /* workaround code.
      *
      * Some instant clients set the environment variables
@@ -147,7 +147,7 @@
         }
     }
 
-#ifdef RUBY_VM
+#ifdef HAVE_TYPE_RB_BLOCKING_FUNCTION_T
     id_thread_key = rb_intern("__oci8_errhp__");
     error = oci8_tls_key_init(&oci8_tls_key);
     if (error != 0) {