The attached patches fix 2 problems with a mingw win32 build:

1) libtool needs a '-no-undefined' flag when linking (Makefile.am.patch)
2) 'errno' is #defined as '(*errno())', so 'errno' is replaced by
'err_no' in dbd_geterror().

Phil
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libdbi-drivers/libdbi-drivers/drivers/sqlite3/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- drivers/sqlite3/Makefile.am 4 Mar 2008 07:57:55 -0000       1.9
+++ drivers/sqlite3/Makefile.am 16 Aug 2008 20:29:21 -0000
@@ -37,7 +37,7 @@
 
 libdir = $(driverdir)
 lib_LTLIBRARIES = $(sqlite3_ltlibs)
-libdbdsqlite3_la_LDFLAGS = $(sqlite3_ldflags) @SQLITE3_LDFLAGS@ @SQLITE3_LIBS@ 
@LIBADD_LIBDBI@
+libdbdsqlite3_la_LDFLAGS = $(sqlite3_ldflags) @SQLITE3_LDFLAGS@ @SQLITE3_LIBS@ 
@LIBADD_LIBDBI@ -no-undefined
 libdbdsqlite3_la_SOURCES = $(sqlite3_sources)
 libdbdsqlite3_la_DEPENDENCIES = dbd_sqlite3.h
 

Index: dbd_sqlite3.c
===================================================================
RCS file: /cvsroot/libdbi-drivers/libdbi-drivers/drivers/sqlite3/dbd_sqlite3.c,v
retrieving revision 1.31
diff -u -r1.31 dbd_sqlite3.c
--- drivers/sqlite3/dbd_sqlite3.c       13 Aug 2008 22:56:03 -0000      1.31
+++ drivers/sqlite3/dbd_sqlite3.c       16 Aug 2008 20:23:23 -0000
@@ -1369,11 +1369,11 @@
   return db;
 }
 
-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
-  /* put error number into errno, error string into errstr
-   * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno 
and errstr filled */
+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
+  /* put error number into err_no, error string into errstr
+   * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both 
err_no and errstr filled */
 
-  *errno = sqlite3_errcode((sqlite3 *)conn->connection);
+  *err_no = sqlite3_errcode((sqlite3 *)conn->connection);
   *errstr = strdup((char*)sqlite3_errmsg((sqlite3 *)conn->connection));
   return 3;
 }

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Libdbi-drivers-devel mailing list
Libdbi-drivers-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libdbi-drivers-devel

Reply via email to