From 27ed1d90f6fa3030087f9d82439d2d781acfb5aa Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 3 Mar 2006 20:32:18 +0000 Subject: [PATCH] Fix tclsqlite.c to better support Mingw. Ticket #1687. (CVS 3119) FossilOrigin-Name: da0e843c05fc708d48e396aaab00fb6247180b51 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/tclsqlite.c | 14 ++++---------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/manifest b/manifest index 3e50df2403..feb62e31cf 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Ignore\sleading\sspaces\son\stext\sto\snumeric\sconversions.\s\sTicket\s#1662.\nFixes\sto\stest\scases\sbroken\sby\sthe\srecent\schanges\sto\sround().\s(CVS\s3118) -D 2006-03-03T19:12:30 +C Fix\stclsqlite.c\sto\sbetter\ssupport\sMingw.\s\sTicket\s#1687.\s(CVS\s3119) +D 2006-03-03T20:32:19 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -72,7 +72,7 @@ F src/shell.c 738f55ed75fb36731e764bfdb40756ac43b90b08 F src/sqlite.h.in 0bf6f03f9a14dde5f3a4f87471840803acaa4497 F src/sqliteInt.h ccc6c2351fb454aec927b5da8d83561c7d4b48cd F src/table.c f64ec4fbfe333f8df925bc6ba494f55e05b0e75e -F src/tclsqlite.c d9c26374b52cd47233ae0620d0a858a59b601f89 +F src/tclsqlite.c cecd84a57914f2d915693276d035b0f6794bb078 F src/test1.c 9d299609a0ce35157fe15cdf8b4c663db5d40386 F src/test2.c ca74a1d8aeb7d9606e8f6b762c5daf85c1a3f92b F src/test3.c 86e99724ee898b119ed575ef9f98618afe7e5e5d @@ -355,7 +355,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P a286e54e26f9a364127649eeea160d5fa8928faf -R c9a2f008c3cee760cce6c3ef34cac338 +P cdca3383c54b33aeafbbdbbb4ae7c90796cf66e5 +R 6cc1348a371ee31255d1425554e4ea3a U drh -Z b4caf361fbef538733ed381452cd4483 +Z af92bed19d59cce04291436bb9f6f48c diff --git a/manifest.uuid b/manifest.uuid index 00e85c5d15..597cac978c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -cdca3383c54b33aeafbbdbbb4ae7c90796cf66e5 \ No newline at end of file +da0e843c05fc708d48e396aaab00fb6247180b51 \ No newline at end of file diff --git a/src/tclsqlite.c b/src/tclsqlite.c index 914af2105a..ed6123be1b 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -11,7 +11,7 @@ ************************************************************************* ** A TCL Interface to SQLite ** -** $Id: tclsqlite.c,v 1.151 2006/02/10 02:27:43 danielk1977 Exp $ +** $Id: tclsqlite.c,v 1.152 2006/03/03 20:32:19 drh Exp $ */ #ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ @@ -23,15 +23,6 @@ #include #include -/* - * Windows needs to know which symbols to export. Unix does not. - * BUILD_sqlite should be undefined for Unix. - */ - -#ifdef BUILD_sqlite -#undef TCL_STORAGE_CLASS -#define TCL_STORAGE_CLASS DLLEXPORT -#endif /* BUILD_sqlite */ #define NUM_PREPARED_STMTS 10 #define MAX_PREPARED_STMTS 100 @@ -2078,6 +2069,9 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ ** used to open a new SQLite database. See the DbMain() routine above ** for additional information. */ +#ifndef EXTERN +# define EXTERN extern +#endif EXTERN int Sqlite3_Init(Tcl_Interp *interp){ Tcl_InitStubs(interp, "8.4", 0); Tcl_CreateObjCommand(interp, "sqlite3", (Tcl_ObjCmdProc*)DbMain, 0, 0); -- 2.47.2