On Sun, 12 Sep 2004, Matt Sergeant wrote:

> On Sat, 11 Sep 2004, Darren Duncan wrote:
> 
> > At 12:49 AM +0100 9/12/04, Matt Sergeant wrote:
> > >This is just because Mac OSX is fussy - Linux won't complain and will let
> > >the latterly loaded symbol supercede. But it's a valid bug in
> > >DBD::SQLite2, so I'll fix it in the next release (should be simple).
> > >Matt.
> > 
> > Now, unless you have a Mac OS X box of your own to test against, 
> > please send me a copy of the changed source files (the whole files, 
> > not diffs) asap, and I'll test your current distro with those 
> > changes.  This way, if something else comes up, I can have tested 
> > that it works good prior to you uploading it to CPAN.  I'll be 
> > waiting for them. -- Darren Duncan
> 
> All DBD::SQLite dev is done on OS X (Panther currently). So it should be 
> easy.

Ah, ok so Panther fixed the annoying strictness of Jaguar. However I think 
the following patch should cover all bases:

Index: SQLite.xs
===================================================================
RCS file: /home/cvs/DBD-SQLite/SQLite.xs,v
retrieving revision 1.6
diff -u -r1.6 SQLite.xs
--- SQLite.xs   2004/07/21 20:50:42     1.6
+++ SQLite.xs   2004/09/12 10:02:30
@@ -37,7 +37,7 @@
     SV *func
     CODE:
     {
-        sqlite_db_create_function( dbh, name, argc, func );
+        sqlite3_db_create_function( dbh, name, argc, func );
     }
 
 void
@@ -48,7 +48,7 @@
     SV *aggr
     CODE:
     {
-        sqlite_db_create_aggregate( dbh, name, argc, aggr );
+        sqlite3_db_create_aggregate( dbh, name, argc, aggr );
     }
 
 int
@@ -56,7 +56,7 @@
   SV *dbh
   int timeout
   CODE:
-    RETVAL = sqlite_busy_timeout( dbh, timeout );
+    RETVAL = dbd_set_sqlite3_busy_timeout( dbh, timeout );
   OUTPUT:
     RETVAL
 
Index: dbdimp.c
===================================================================
RCS file: /home/cvs/DBD-SQLite/dbdimp.c,v
retrieving revision 1.50
diff -u -r1.50 dbdimp.c
--- dbdimp.c    2004/08/29 10:11:57     1.50
+++ dbdimp.c    2004/09/12 10:02:30
@@ -128,7 +128,7 @@
 }
 
 int
-sqlite_busy_timeout ( SV *dbh, int timeout )
+dbd_set_sqlite3_busy_timeout ( SV *dbh, int timeout )
 {
   D_imp_dbh(dbh);
   if (timeout) {
@@ -761,7 +761,7 @@
 }
 
 void
-sqlite_db_create_function( SV *dbh, const char *name, int argc, SV *func 
)
+sqlite3_db_create_function( SV *dbh, const char *name, int argc, SV *func 
)
 {
     D_imp_dbh(dbh);
     int rv;
@@ -975,7 +975,7 @@
 }
 
 void
-sqlite_db_create_aggregate( SV *dbh, const char *name, int argc, SV 
*aggr_pkg )
+sqlite3_db_create_aggregate( SV *dbh, const char *name, int argc, SV 
*aggr_pkg )
 {
     D_imp_dbh(dbh);
     int rv;



______________________________________________________________________
This email has been scanned by the MessageLabs Email Security System.
For more information please visit http://www.messagelabs.com/email 
______________________________________________________________________

Reply via email to