diff --git a/manifest b/manifest index 15b8c36539..24a03d5381 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -C Omit\ssome\scode\sthat\sis\snot\sused\swhen\sSQLITE_SECURE_DELETE\sis\sdefined. -D 2009-11-10T01:12:51 +C Remove\sfrom\sthe\sTCL\sinterface\ssome\sold\scode\sassociated\swith\ssqlite3_analyzer. +D 2009-11-10T01:13:25 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in a77dfde96ad86aafd3f71651a4333a104debe86a F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -171,7 +171,7 @@ F src/sqliteInt.h 55d26b83d16107804693982028c8b3a075f5a836 F src/sqliteLimit.h 285dd7140722adfa9998b9393314eaaf50215c27 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76 F src/table.c cc86ad3d6ad54df7c63a3e807b5783c90411a08d -F src/tclsqlite.c c2c4047177213baf485d4401c7dbb30a3c2ba322 +F src/tclsqlite.c 21432a361808b6c3d405710cdd22fa1b16f7b84f F src/test1.c 2232a39540a6b72f3be8f84b34d1ca0714f92aee F src/test2.c 0de743ec8890ca4f09e0bce5d6d5a681f5957fec F src/test3.c 2445c2beb5e7a0c91fd8136dc1339ec369a24898 @@ -765,14 +765,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 9fb699193378bf812ef97889adc0b1a98ad56d5b -R fdf5a8d657aeaba08e7c5c254f1f6526 +P 5a9e746357aa8edeef6b89f01e19cd57555bef32 +R 04f0ccc70967e16360ae869df51644e9 U drh -Z 7e5ce34c05f0188b286b3ae061a48378 +Z 8cf10c7bec8947796a5c5b231a566501 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFK+L4ZoxKgR168RlERAtZAAKCCTC8tli73ESEGoRpFvsk/j0ZXlgCdEm8J -c0lB3B9PrEPRFrLUhti7U7A= -=s4Q4 +iD8DBQFK+L44oxKgR168RlERAvi3AJ46N9OkpanfHBR53gc4eS0f9BzZKACfYz8R +2KvfKa+fMr0laifXlNXWvsA= +=ZXoW -----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index 94961403d6..cde72aac93 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5a9e746357aa8edeef6b89f01e19cd57555bef32 \ No newline at end of file +01f2271e51751ff66061f65556a5e324f243756a \ No newline at end of file diff --git a/src/tclsqlite.c b/src/tclsqlite.c index ca433acb8c..604e937952 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -3447,16 +3447,6 @@ static char zMainloop[] = ; #endif -/* -** If the macro TCLSH is two, then get the main loop code out of -** the separate file "spaceanal_tcl.h". -*/ -#if TCLSH==2 -static char zMainloop[] = -#include "spaceanal_tcl.h" -; -#endif - #define TCLSH_MAIN main /* Needed to fake out mktclapp */ int TCLSH_MAIN(int argc, char **argv){ Tcl_Interp *interp; @@ -3528,7 +3518,7 @@ int TCLSH_MAIN(int argc, char **argv){ #endif } #endif - if( argc>=2 || TCLSH==2 ){ + if( argc>=2 ){ int i; char zArgc[32]; sqlite3_snprintf(sizeof(zArgc), zArgc, "%d", argc-(3-TCLSH)); @@ -3539,14 +3529,14 @@ int TCLSH_MAIN(int argc, char **argv){ Tcl_SetVar(interp, "argv", argv[i], TCL_GLOBAL_ONLY | TCL_LIST_ELEMENT | TCL_APPEND_VALUE); } - if( TCLSH==1 && Tcl_EvalFile(interp, argv[1])!=TCL_OK ){ + if( Tcl_EvalFile(interp, argv[1])!=TCL_OK ){ const char *zInfo = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY); if( zInfo==0 ) zInfo = Tcl_GetStringResult(interp); fprintf(stderr,"%s: %s\n", *argv, zInfo); return 1; } } - if( argc<=1 || TCLSH==2 ){ + if( argc<=1 ){ Tcl_GlobalEval(interp, zMainloop); } return 0;