From: drh <drh@noemail.net>
Date: Mon, 6 Mar 2006 23:30:51 +0000 (+0000)
Subject: Remove all reference to EXTERN from tclsqlite.c.  Ticket #1687. (CVS 3127)
X-Git-Tag: version-3.6.10~3040
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86b7f575558f87c69144e3834d5eb6b32b403759;p=thirdparty%2Fsqlite.git

Remove all reference to EXTERN from tclsqlite.c.  Ticket #1687. (CVS 3127)

FossilOrigin-Name: b4d3e0d528c7d17fa3d05956a188cd4d431204b2
---

diff --git a/manifest b/manifest
index 9815aac9d7..86c25a3dfa 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Code\schanges\sresulting\sfrom\sCoverity\sanalysis.\nhttp://scan.coverity.com/\s\sFound\s1\spotential\ssegfault\sin\ssqlite3_mprintf().\nAlso\s2\sfailures\sto\sfclose()\sfollowing\sa\smalloc()\sfailure.\s\sAnd\slots\sof\ncases\swhere\sunnecessary\sconditionals\scould\sbe\sremoved\sfrom\sthe\scode.\s(CVS\s3126)
-D 2006-03-06T20:55:46
+C Remove\sall\sreference\sto\sEXTERN\sfrom\stclsqlite.c.\s\sTicket\s#1687.\s(CVS\s3127)
+D 2006-03-06T23:30:52
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -72,7 +72,7 @@ F src/shell.c 7a4b16f85d8f6f25d917cdc3d0f7e18f84867adf
 F src/sqlite.h.in 0bf6f03f9a14dde5f3a4f87471840803acaa4497
 F src/sqliteInt.h ccc6c2351fb454aec927b5da8d83561c7d4b48cd
 F src/table.c f64ec4fbfe333f8df925bc6ba494f55e05b0e75e
-F src/tclsqlite.c 39bb47e9475ae54b896a31c0788747c7304f96b7
+F src/tclsqlite.c 607ccf5ade808ed3620544baca42b13e3411bf6d
 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 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 9c26570743d878dee963e37728969fb30a2fb436
-R afb3e1512c75137b9bdb084df031bde0
+P e510e6dd9d6261f33b853af3b32d155b9d6b63b3
+R e2e0fca8ac4359425519457630a20ac4
 U drh
-Z 84042fb17c75d08debcf570da364546d
+Z 5eb0109f1dc4aaae7998126e8d4fe6bc
diff --git a/manifest.uuid b/manifest.uuid
index 5abb1e9c57..040dd5dd3c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e510e6dd9d6261f33b853af3b32d155b9d6b63b3
\ No newline at end of file
+b4d3e0d528c7d17fa3d05956a188cd4d431204b2
\ No newline at end of file
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 8f3a0b68ac..1c077bd8d2 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.153 2006/03/06 20:55:46 drh Exp $
+** $Id: tclsqlite.c,v 1.154 2006/03/06 23:30:52 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -2070,10 +2070,7 @@ 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){
+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);
@@ -2081,15 +2078,15 @@ EXTERN int Sqlite3_Init(Tcl_Interp *interp){
   Tcl_PkgProvide(interp, "sqlite", PACKAGE_VERSION);
   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 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
-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; }
+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