ruby 1.9 compatibility tweaks (thanks Roman Le Negrate <roman2k@free.fr>)

3 files changed, 62 insertions, 61 deletions

diff --git a/ext/sqlite3_api/Makefile b/ext/sqlite3_api/Makefile
index 75942cc..13a7167 100644
--- a/ext/sqlite3_api/Makefile
+++ b/ext/sqlite3_api/Makefile
@@ -4,7 +4,7 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /opt/local/lib/ruby/1.8/i686-darwin8.5.2
+topdir = /opt/local/lib/ruby/1.8/i686-darwin8.10.1
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
 prefix = $(DESTDIR)/opt/local
@@ -36,8 +36,10 @@ LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
-CFLAGS   =  -fno-common -O -pipe -I/opt/local/include  -fno-common -pipe -fno-common 
-CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) -DHAVE_SQLITE3_H -I/usr/local/include -O -pipe -I/opt/local/include
+RUBY_EXTCONF_H = 
+CFLAGS   =  -fno-common -O2  -fno-common -pipe -fno-common 
+INCFLAGS = -I. -I. -I/opt/local/lib/ruby/1.8/i686-darwin8.10.1 -I.
+CPPFLAGS = -DHAVE_SQLITE3_H -I/usr/local/include -I/opt/local/include
 CXXFLAGS = $(CFLAGS) 
 DLDFLAGS = -L/opt/local/lib  
 LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
@@ -46,9 +48,9 @@ EXEEXT =
 
 RUBY_INSTALL_NAME = ruby
 RUBY_SO_NAME = ruby
-arch = i686-darwin8.5.2
-sitearch = i686-darwin8.5.2
-vendorarch = i686-darwin8.5.2
+arch = i686-darwin8.10.1
+sitearch = i686-darwin8.10.1
+vendorarch = i686-darwin8.10.1
 ruby_version = 1.8
 ruby = /opt/local/bin/ruby
 RUBY = $(ruby)
@@ -63,8 +65,8 @@ COPY = cp
 
 preload = 
 
-libpath = /usr/local/lib $(libdir)
-LIBPATH =  -L"/usr/local/lib" -L"$(libdir)"
+libpath = $(libdir) /usr/local/lib
+LIBPATH =  -L"$(libdir)" -L"/usr/local/lib"
 DEFFILE = 
 
 CLEANFILES = 
@@ -79,6 +81,7 @@ SRCS = sqlite3_api_wrap.c
 OBJS = sqlite3_api_wrap.o
 TARGET = sqlite3_api
 DLLIB = $(TARGET).bundle
+EXTSTATIC = 
 STATIC_LIB = 
 
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
@@ -96,7 +99,7 @@ clean:
 		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
 
 distclean:	clean
-		@-$(RM) Makefile extconf.h conftest.* mkmf.log
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
 
 realclean:	distclean
@@ -120,19 +123,19 @@ site-install-rb: install-rb
 .SUFFIXES: .c .m .cc .cxx .cpp .C .o
 
 .cc.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .cxx.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .cpp.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .C.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .c.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
 
 $(DLLIB): $(OBJS)
 	@-$(RM) $@
diff --git a/ext/sqlite3_api/sqlite3_api.i b/ext/sqlite3_api/sqlite3_api.i
index 8254570..91ccea2 100644
--- a/ext/sqlite3_api/sqlite3_api.i
+++ b/ext/sqlite3_api/sqlite3_api.i
@@ -3,7 +3,6 @@
 %{
 #include <sqlite3.h>
 #include "ruby.h"
-#include "intern.h"
 
 #define Init_API Init_sqlite3_api
 
@@ -109,7 +108,7 @@ struct CallbackData {
 };
 
 %typemap(in) const void *str {
-  $1 = (void*)RSTRING($input)->ptr;
+  $1 = (void*)RSTRING_PTR($input);
 }
 
 %typemap(in) (const char *filename, sqlite3**) {
@@ -127,7 +126,7 @@ struct CallbackData {
 }
 
 %typemap(in) (const void *filename, sqlite3**) {
-  $1 = (void*)RSTRING($input)->ptr;
+  $1 = (void*)RSTRING_PTR($input);
   $2 = (sqlite3**)malloc( sizeof( sqlite3* ) );
 }
 
@@ -160,8 +159,8 @@ typedef void VALBLOB;
 }
 
 %typemap(in) (const char * sql,int,sqlite3_stmt**,const char**) (sqlite3_stmt *stmt, char *errmsg) {
-  $1 = RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
   $3 = &stmt2;
   $4 = &errmsg2;
 }
@@ -176,8 +175,8 @@ typedef void VALBLOB;
 }
 
 %typemap(in) (const void* sql,int,sqlite3_stmt**,const void**) (sqlite3_stmt *stmt, void *errmsg) {
-  $1 = RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
   $3 = &stmt2;
   $4 = &errmsg2;
 }
@@ -196,35 +195,35 @@ typedef void VALBLOB;
 }
 
 %typemap(in) (const void *blob,int) {
-  $1 = (void*)RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = (void*)RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
 }
 
 %typemap(in) (const void *blob,int,void(*free)(void*)) {
-  $1 = (void*)RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = (void*)RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
   $3 = SQLITE_TRANSIENT;
 }
 
 %typemap(in) (const char *text,int) {
-  $1 = RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
 }
 
 %typemap(in) (const char *text,int,void(*free)(void*)) {
-  $1 = RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
   $3 = SQLITE_TRANSIENT;
 }
 
 %typemap(in) (const void *utf16,int) {
-  $1 = (void*)RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = (void*)RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
 }
 
 %typemap(in) (const void *utf16,int,void(*free)(void*)) {
-  $1 = (void*)RSTRING($input)->ptr;
-  $2 = RSTRING($input)->len;
+  $1 = (void*)RSTRING_PTR($input);
+  $2 = RSTRING_LEN($input);
   $3 = SQLITE_TRANSIENT;
 }
 
diff --git a/ext/sqlite3_api/sqlite3_api_wrap.c b/ext/sqlite3_api/sqlite3_api_wrap.c
index e0167d1..f900e4b 100644
--- a/ext/sqlite3_api/sqlite3_api_wrap.c
+++ b/ext/sqlite3_api/sqlite3_api_wrap.c
@@ -1063,7 +1063,6 @@ extern "C" {
 
 #include <sqlite3.h>
 #include "ruby.h"
-#include "intern.h"
 
 #define Init_API Init_sqlite3_api
 
@@ -1409,7 +1408,7 @@ _wrap_sqlite3_complete16(int argc, VALUE *argv, VALUE self) {
     if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     {
-        arg1 = (void*)RSTRING(argv[0])->ptr;
+        arg1 = (void*)RSTRING_PTR(argv[0]);
     }
     result = (int)sqlite3_complete16((void const *)arg1);
     
@@ -1534,7 +1533,7 @@ _wrap_sqlite3_open16(int argc, VALUE *argv, VALUE self) {
     if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     {
-        arg1 = (void*)RSTRING(argv[0])->ptr;
+        arg1 = (void*)RSTRING_PTR(argv[0]);
         arg2 = (sqlite3**)malloc( sizeof( sqlite3* ) );
     }
     result = (int)sqlite3_open16((void const *)arg1,arg2);
@@ -1624,8 +1623,8 @@ _wrap_sqlite3_prepare(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3, 0);
     {
-        arg2 = RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
         arg4 = &stmt2;
         arg5 = &errmsg2;
     }
@@ -1660,8 +1659,8 @@ _wrap_sqlite3_prepare16(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3, 0);
     {
-        arg2 = RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
         arg4 = &stmt2;
         arg5 = &errmsg2;
     }
@@ -1699,8 +1698,8 @@ _wrap_sqlite3_bind_blob(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_stmt, 0);
     arg2 = NUM2INT(argv[1]);
     {
-        arg3 = (void*)RSTRING(argv[2])->ptr;
-        arg4 = RSTRING(argv[2])->len;
+        arg3 = (void*)RSTRING_PTR(argv[2]);
+        arg4 = RSTRING_LEN(argv[2]);
         arg5 = SQLITE_TRANSIENT;
     }
     result = (int)sqlite3_bind_blob(arg1,arg2,(void const *)arg3,arg4,arg5);
@@ -1805,8 +1804,8 @@ _wrap_sqlite3_bind_text(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_stmt, 0);
     arg2 = NUM2INT(argv[1]);
     {
-        arg3 = RSTRING(argv[2])->ptr;
-        arg4 = RSTRING(argv[2])->len;
+        arg3 = RSTRING_PTR(argv[2]);
+        arg4 = RSTRING_LEN(argv[2]);
         arg5 = SQLITE_TRANSIENT;
     }
     result = (int)sqlite3_bind_text(arg1,arg2,(char const *)arg3,arg4,arg5);
@@ -1831,8 +1830,8 @@ _wrap_sqlite3_bind_text16(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_stmt, 0);
     arg2 = NUM2INT(argv[1]);
     {
-        arg3 = (void*)RSTRING(argv[2])->ptr;
-        arg4 = RSTRING(argv[2])->len;
+        arg3 = (void*)RSTRING_PTR(argv[2]);
+        arg4 = RSTRING_LEN(argv[2]);
         arg5 = SQLITE_TRANSIENT;
     }
     result = (int)sqlite3_bind_text16(arg1,arg2,(void const *)arg3,arg4,arg5);
@@ -2286,7 +2285,7 @@ _wrap_sqlite3_create_function16(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 8)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3, 0);
     {
-        arg2 = (void*)RSTRING(argv[1])->ptr;
+        arg2 = (void*)RSTRING_PTR(argv[1]);
     }
     arg3 = NUM2INT(argv[2]);
     arg4 = NUM2INT(argv[3]);
@@ -2528,8 +2527,8 @@ _wrap_sqlite3_result_blob(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = (void*)RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = (void*)RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
         arg4 = SQLITE_TRANSIENT;
     }
     sqlite3_result_blob(arg1,(void const *)arg2,arg3,arg4);
@@ -2563,8 +2562,8 @@ _wrap_sqlite3_result_error(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
     }
     sqlite3_result_error(arg1,(char const *)arg2,arg3);
     
@@ -2582,8 +2581,8 @@ _wrap_sqlite3_result_error16(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = (void*)RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = (void*)RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
     }
     sqlite3_result_error16(arg1,(void const *)arg2,arg3);
     
@@ -2634,8 +2633,8 @@ _wrap_sqlite3_result_text(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
         arg4 = SQLITE_TRANSIENT;
     }
     sqlite3_result_text(arg1,(char const *)arg2,arg3,arg4);
@@ -2655,8 +2654,8 @@ _wrap_sqlite3_result_text16(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = (void*)RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = (void*)RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
         arg4 = SQLITE_TRANSIENT;
     }
     sqlite3_result_text16(arg1,(void const *)arg2,arg3,arg4);
@@ -2676,8 +2675,8 @@ _wrap_sqlite3_result_text16le(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = (void*)RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = (void*)RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
         arg4 = SQLITE_TRANSIENT;
     }
     sqlite3_result_text16le(arg1,(void const *)arg2,arg3,arg4);
@@ -2697,8 +2696,8 @@ _wrap_sqlite3_result_text16be(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_sqlite3_context, 0);
     {
-        arg2 = (void*)RSTRING(argv[1])->ptr;
-        arg3 = RSTRING(argv[1])->len;
+        arg2 = (void*)RSTRING_PTR(argv[1]);
+        arg3 = RSTRING_LEN(argv[1]);
         arg4 = SQLITE_TRANSIENT;
     }
     sqlite3_result_text16be(arg1,(void const *)arg2,arg3,arg4);