[ruby-oci8-commit] [436] trunk/ruby-oci8/ext/oci8: * ext/oci8/extconf.rb, ext/oci8/oci8.h: fix for Solaris compiler.

nobody at rubyforge.org nobody at rubyforge.org
Sat Jul 16 09:32:48 EDT 2011


Revision: 436
Author:   kubo
Date:     2011-07-16 09:32:48 -0400 (Sat, 16 Jul 2011)

Log Message:
-----------
* ext/oci8/extconf.rb, ext/oci8/oci8.h: fix for Solaris compiler.
    (Reported by Sanjiv Patel.)

Modified Paths:
--------------
    branches/ruby-oci8-2.0/ChangeLog
    branches/ruby-oci8-2.0/ext/oci8/extconf.rb
    branches/ruby-oci8-2.0/ext/oci8/oci8.h
    trunk/ruby-oci8/ChangeLog
    trunk/ruby-oci8/ext/oci8/extconf.rb
    trunk/ruby-oci8/ext/oci8/oci8.h

Modified: branches/ruby-oci8-2.0/ChangeLog
===================================================================
--- branches/ruby-oci8-2.0/ChangeLog	2011-07-16 13:27:26 UTC (rev 435)
+++ branches/ruby-oci8-2.0/ChangeLog	2011-07-16 13:32:48 UTC (rev 436)
@@ -1,4 +1,8 @@
 2011-07-16  KUBO Takehiro  <kubo at jiubao.org>
+	* ext/oci8/extconf.rb, ext/oci8/oci8.h: fix for Solaris compiler.
+	    (Reported by Sanjiv Patel.)
+
+2011-07-16  KUBO Takehiro  <kubo at jiubao.org>
 	* ext/oci8/oraconf.rb: Fix for Oracle 11g solaris-sparc32 instant client.
 	    The machine type of Oracle 10g solaris-sparc32 instant client was
 	    sparc but that of oracle 11g is sparc32plus.

Modified: branches/ruby-oci8-2.0/ext/oci8/extconf.rb
===================================================================
--- branches/ruby-oci8-2.0/ext/oci8/extconf.rb	2011-07-16 13:27:26 UTC (rev 435)
+++ branches/ruby-oci8-2.0/ext/oci8/extconf.rb	2011-07-16 13:32:48 UTC (rev 436)
@@ -112,7 +112,7 @@
 have_var("ruby_errinfo", "ruby.h") # ruby 1.8
 have_func("rb_errinfo", "ruby.h")  # ruby 1.9
 
-have_type("rb_blocking_function_t", "ruby.h")
+have_type("rb_blocking_function_t*", "ruby.h")
 have_func("rb_set_end_proc", "ruby.h")
 have_func("rb_class_superclass", "ruby.h")
 have_func("rb_thread_blocking_region", "ruby.h")

Modified: branches/ruby-oci8-2.0/ext/oci8/oci8.h
===================================================================
--- branches/ruby-oci8-2.0/ext/oci8/oci8.h	2011-07-16 13:27:26 UTC (rev 435)
+++ branches/ruby-oci8-2.0/ext/oci8/oci8.h	2011-07-16 13:32:48 UTC (rev 436)
@@ -132,7 +132,7 @@
 #if !defined(HAVE_RB_ERRINFO) && defined(HAVE_RUBY_ERRINFO)
 #define rb_errinfo() ruby_errinfo
 #endif
-#ifndef HAVE_TYPE_RB_BLOCKING_FUNCTION_T
+#if !defined HAVE_TYPE_RB_BLOCKING_FUNCTION_T_ && !defined HAVE_TYPE_RB_BLOCKING_FUNCTION_TP
 typedef VALUE rb_blocking_function_t(void *);
 #endif
 

Modified: trunk/ruby-oci8/ChangeLog
===================================================================
--- trunk/ruby-oci8/ChangeLog	2011-07-16 13:27:26 UTC (rev 435)
+++ trunk/ruby-oci8/ChangeLog	2011-07-16 13:32:48 UTC (rev 436)
@@ -1,4 +1,8 @@
 2011-07-16  KUBO Takehiro  <kubo at jiubao.org>
+	* ext/oci8/extconf.rb, ext/oci8/oci8.h: fix for Solaris compiler.
+	    (Reported by Sanjiv Patel.)
+
+2011-07-16  KUBO Takehiro  <kubo at jiubao.org>
 	* ext/oci8/oraconf.rb: Fix for Oracle 11g solaris-sparc32 instant client.
 	    The machine type of Oracle 10g solaris-sparc32 instant client was
 	    sparc but that of oracle 11g is sparc32plus.

Modified: trunk/ruby-oci8/ext/oci8/extconf.rb
===================================================================
--- trunk/ruby-oci8/ext/oci8/extconf.rb	2011-07-16 13:27:26 UTC (rev 435)
+++ trunk/ruby-oci8/ext/oci8/extconf.rb	2011-07-16 13:32:48 UTC (rev 436)
@@ -114,7 +114,7 @@
 have_var("ruby_errinfo", "ruby.h") # ruby 1.8
 have_func("rb_errinfo", "ruby.h")  # ruby 1.9
 
-have_type("rb_blocking_function_t", "ruby.h")
+have_type("rb_blocking_function_t*", "ruby.h")
 have_func("rb_set_end_proc", "ruby.h")
 have_func("rb_class_superclass", "ruby.h")
 have_func("rb_thread_blocking_region", "ruby.h")

Modified: trunk/ruby-oci8/ext/oci8/oci8.h
===================================================================
--- trunk/ruby-oci8/ext/oci8/oci8.h	2011-07-16 13:27:26 UTC (rev 435)
+++ trunk/ruby-oci8/ext/oci8/oci8.h	2011-07-16 13:32:48 UTC (rev 436)
@@ -135,7 +135,7 @@
 #if !defined(HAVE_RB_ERRINFO) && defined(HAVE_RUBY_ERRINFO)
 #define rb_errinfo() ruby_errinfo
 #endif
-#ifndef HAVE_TYPE_RB_BLOCKING_FUNCTION_T
+#if !defined HAVE_TYPE_RB_BLOCKING_FUNCTION_T_ && !defined HAVE_TYPE_RB_BLOCKING_FUNCTION_TP
 typedef VALUE rb_blocking_function_t(void *);
 #endif
 




More information about the ruby-oci8-commit mailing list