From: drh <drh@noemail.net>
Date: Wed, 5 Oct 2005 10:40:15 +0000 (+0000)
Subject: Changes to support TEA on cygwin. (CVS 2742)
X-Git-Tag: version-3.6.10~3418
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29bc461550a03419dc8a8be10d62eee4d8ea3c97;p=thirdparty%2Fsqlite.git

Changes to support TEA on cygwin. (CVS 2742)

FossilOrigin-Name: e80fecc986f1fe93e127398b081054766c5383cf
---

diff --git a/manifest b/manifest
index 6f969abe02..724f9d2166 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Another\sattempt\sto\sget\sfdatasync\sto\sbe\signored\son\snon-conforming\sposix\ssystems.\nNow\sa\ssystem\shas\sto\sopt-in\sfor\sfdatasync\sinstead\sof\sopt-out.\nTicket\s#1467.\s(CVS\s2741)
-D 2005-10-05T10:29:36
+C Changes\sto\ssupport\sTEA\son\scygwin.\s(CVS\s2742)
+D 2005-10-05T10:40:15
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -69,7 +69,7 @@ F src/shell.c 3596c1e559b82663057940d19ba533ad421c7dd3
 F src/sqlite.h.in 461b2535550cf77aedfd44385da11ef7d63e57a2
 F src/sqliteInt.h 53daa72541b4336c5e89773cf39717ed695bd523
 F src/table.c abc7b6946a2c2ee0603f067f8210ed004ea9a9ac
-F src/tclsqlite.c ac94682f9e601dd373912c46414a5a842db2089a
+F src/tclsqlite.c 4f274fae3d4a1863451a553dd8e5015747a5d91d
 F src/test1.c 0f1a66f65a54fba029f7e93b7500d49443dc959b
 F src/test2.c 4196848c845626e7df894470f27329e80bfe92aa
 F src/test3.c f4e6a16a602091696619a1171bda25c0e3df49f7
@@ -314,7 +314,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 6d4bc8f83b228b3804fffcb17ac57e1f754fa9cd
-R 2a81a5e046bb12e6c133d1e450e99468
+P 115340d4e85f1bbbab657edbb504284343d86e2c
+R f8808c58f7ce989df672bc4fb38af8c4
 U drh
-Z 6df1f50e225442ff181a6694bcabfb37
+Z 84a44cff6e170e8e938eb8de4bc1c585
diff --git a/manifest.uuid b/manifest.uuid
index eef0929bc1..6d83cd3faf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-115340d4e85f1bbbab657edbb504284343d86e2c
\ No newline at end of file
+e80fecc986f1fe93e127398b081054766c5383cf
\ No newline at end of file
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 5e5e6268f2..9baf582c43 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.132 2005/08/29 23:00:04 drh Exp $
+** $Id: tclsqlite.c,v 1.133 2005/10/05 10:40:15 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -23,6 +23,16 @@
 #include <assert.h>
 #include <ctype.h>
 
+/*
+ * 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
 
@@ -1954,6 +1964,15 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
 # define Tcl_InitStubs(a,b,c)
 #endif
 
+/*
+** Make sure we have a PACKAGE_VERSION macro defined.  This will be
+** defined automatically by the TEA makefile.  But other makefiles
+** do not define it.
+*/
+#ifndef PACKAGE_VERSION
+# define PACKAGE_VERSION SQLITE_VERSION
+#endif
+
 /*
 ** Initialize this module.
 **
@@ -1963,23 +1982,23 @@ 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.
 */
-int Sqlite3_Init(Tcl_Interp *interp){
+EXTERN int Sqlite3_Init(Tcl_Interp *interp){
   Tcl_InitStubs(interp, "8.4", 0);
   Tcl_CreateObjCommand(interp, "sqlite3", (Tcl_ObjCmdProc*)DbMain, 0, 0);
-  Tcl_PkgProvide(interp, "sqlite3", "3.0");
+  Tcl_PkgProvide(interp, "sqlite3", PACKAGE_VERSION);
   Tcl_CreateObjCommand(interp, "sqlite", (Tcl_ObjCmdProc*)DbMain, 0, 0);
-  Tcl_PkgProvide(interp, "sqlite", "3.0");
+  Tcl_PkgProvide(interp, "sqlite", PACKAGE_VERSION);
   return TCL_OK;
 }
-int Tclsqlite3_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
-int Sqlite3_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
-int Tclsqlite3_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
+EXTERN int Tclsqlite3_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
+EXTERN int Sqlite3_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
+EXTERN int Tclsqlite3_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
 
 #ifndef SQLITE_3_SUFFIX_ONLY
-int Sqlite_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
-int Tclsqlite_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
-int Sqlite_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
-int Tclsqlite_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
+EXTERN int Sqlite_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
+EXTERN int Tclsqlite_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
+EXTERN int Sqlite_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
+EXTERN int Tclsqlite_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
 #endif
 
 #ifdef TCLSH