diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 5 | ||||
| -rw-r--r-- | src/sqliteInt.h | 10 | ||||
| -rw-r--r-- | src/tclsqlite.c | 26 |
3 files changed, 23 insertions, 18 deletions
diff --git a/src/main.c b/src/main.c index 9a9b96e08..386dcbaf9 100644 --- a/src/main.c +++ b/src/main.c @@ -14,7 +14,7 @@ ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** -** $Id: main.c,v 1.268 2004/11/22 19:12:20 drh Exp $ +** $Id: main.c,v 1.269 2005/01/08 18:42:28 drh Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -843,9 +843,6 @@ int sqlite3BtreeFactory( btree_flags |= BTREE_OMIT_JOURNAL; } if( zFilename==0 ){ -#ifndef TEMP_STORE -# define TEMP_STORE 1 -#endif #if TEMP_STORE==0 /* Do nothing */ #endif diff --git a/src/sqliteInt.h b/src/sqliteInt.h index cd4907c10..99db739cb 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.350 2005/01/03 01:27:19 drh Exp $ +** @(#) $Id: sqliteInt.h,v 1.351 2005/01/08 18:42:28 drh Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -110,6 +110,14 @@ /* #define SQLITE_OMIT_ALTERTABLE */ /* +** Provide a default value for TEMP_STORE in case it is not specified +** on the command-line +*/ +#ifndef TEMP_STORE +# define TEMP_STORE 1 +#endif + +/* ** GCC does not define the offsetof() macro so we'll have to do it ** ourselves. */ diff --git a/src/tclsqlite.c b/src/tclsqlite.c index d94bb1d1e..3535bbbf3 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -11,7 +11,7 @@ ************************************************************************* ** A TCL Interface to SQLite ** -** $Id: tclsqlite.c,v 1.111 2004/12/17 20:48:06 drh Exp $ +** $Id: tclsqlite.c,v 1.112 2005/01/08 18:42:29 drh Exp $ */ #ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ @@ -1439,20 +1439,20 @@ 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_CreateObjCommand(interp, "sqlite", (Tcl_ObjCmdProc*)DbMain, 0, 0); + Tcl_PkgProvide(interp, "sqlite", "3.0"); return TCL_OK; } -int Tclsqlite3_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"); - return TCL_OK; -} -int Sqlite3_SafeInit(Tcl_Interp *interp){ - return TCL_OK; -} -int Tclsqlite3_SafeInit(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; } + +#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; } +#endif #ifdef TCLSH /***************************************************************************** |