From: drh <drh@noemail.net>
Date: Thu, 26 Aug 2010 16:46:57 +0000 (+0000)
Subject: Add EXTERN macros before entry points in tclsqlite.c.  This undoes the
X-Git-Tag: experimental~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b652f43205d28969e7d46568a15f422d475d5084;p=thirdparty%2Fsqlite.git

Add EXTERN macros before entry points in tclsqlite.c.  This undoes the
change [b4d3e0d528c7d17fa3d05] on [2006-03-06 23:30:52].

FossilOrigin-Name: 8b2cf9d492901a65942d0e0b87c568d1539deece
---

diff --git a/manifest b/manifest
index abb2014d81..fd1ec43011 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Fix\sa\scouple\sof\smemory\sleaks\sin\sr-tree\sthat\scan\soccur\sfollowing\san\sOOM\scondition.
-D 2010-08-26T14:15:38
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Add\sEXTERN\smacros\sbefore\sentry\spoints\sin\stclsqlite.c.\s\sThis\sundoes\sthe\nchange\s[b4d3e0d528c7d17fa3d05]\son\s[2006-03-06\s23:30:52].
+D 2010-08-26T16:46:58
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 543f91f24cd7fee774ecc0a61c19704c0c3e78fd
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -177,7 +180,7 @@ F src/sqliteInt.h e33b15e8176442bf7484f0e716edfd1ce03b2979
 F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
 F src/status.c 496913d4e8441195f6f2a75b1c95993a45b9b30b
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
-F src/tclsqlite.c a378d78d7af3f7a10bd7aab1db9388113e7616c4
+F src/tclsqlite.c b1565eb727ec7121b59287fed77fc378118bfb69
 F src/test1.c 55005c9781b157b1d215ba145768783b9abae78c
 F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
 F src/test3.c 4c21700c73a890a47fc685c1097bfb661346ac94
@@ -847,7 +850,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 90f40cd36860d3af13ec24575dff7cc1f57ac493
-R a46858ce791434a7e43a1a791bfcb584
-U dan
-Z 87e2b951218964ab648d9c5a5a463f97
+P 1975a27cdec09e1dad4ca8281a87dd7754c02c3e
+R f25d441688f62b1bff0d009ddc9b05f0
+U drh
+Z 9a37771618dd7265a40873a32109b615
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFMdpqGoxKgR168RlERAgpjAKCERLBDfs1cXus2KLEcDb9piX9h0ACeNdCt
+sppF4YYqwSPmRWJwYVXibNc=
+=57pg
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 639bbf9da9..e64cb054d4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1975a27cdec09e1dad4ca8281a87dd7754c02c3e
\ No newline at end of file
+8b2cf9d492901a65942d0e0b87c568d1539deece
\ No newline at end of file
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 2872896a7a..141e68e55f 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -3014,8 +3014,10 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
 ** if the extension only supplies one new name!)  The "sqlite" command is
 ** used to open a new SQLite database.  See the DbMain() routine above
 ** for additional information.
+**
+** The EXTERN macros are required by TCL in order to work on windows.
 */
-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", PACKAGE_VERSION);
@@ -3030,13 +3032,13 @@ int Sqlite3_Init(Tcl_Interp *interp){
 
   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; }
-int Sqlite3_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
-int Tclsqlite3_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
-int Sqlite3_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK; }
-int Tclsqlite3_SafeUnload(Tcl_Interp *interp, int flags){ 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; }
+EXTERN int Sqlite3_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
+EXTERN int Tclsqlite3_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
+EXTERN int Sqlite3_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK; }
+EXTERN int Tclsqlite3_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK;}
 
 
 #ifndef SQLITE_3_SUFFIX_ONLY