Fix the declaration of sqlite3PendingByte so that it works with the

amalgamation. (CVS 6264)

FossilOrigin-Name: 193c871f3d16ce982040334c543610d330117bd5

diff --git a/manifest b/manifest
index 954405e11d64a8ee21d32dda38a54d42f9bc36c5..689b88e93a4dbb65f378638bdd15cc5c3fad0632 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\spending\sbyte\sadjustable\svia\ssqlite3_test_control()\son\sall\sbuilds,\nnot\sjust\son\stest\sbuilds.\s(CVS\s6263)
-D 2009-02-05T16:31:46
+C Fix\sthe\sdeclaration\sof\ssqlite3PendingByte\sso\sthat\sit\sworks\swith\sthe\namalgamation.\s(CVS\s6264)
+D 2009-02-05T16:53:43
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c7a5a30fb6852bd7839b1024e1661da8549878ee
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -159,7 +159,7 @@ F src/select.c ae72b604e47092521c4d9ae54e1b1cbeb872a747
 F src/shell.c f109ebbb50132926ebbc173a6c2d8838d5d78527
 F src/sqlite.h.in bc6654bb2c8e07281c66e860a018b1f4cb6e5dfa
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
-F src/sqliteInt.h b4b0933d3833faded0574f2165b26737636a00cf
+F src/sqliteInt.h 55cc7e45a7fcc166be62b984168dd69159d877eb
 F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c 332ab0ea691e63862e2a8bdfe2c0617ee61062a3
@@ -701,7 +701,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 82e03f1b5481c6fe5e94976f086e8fe8c99881af
-R 2734eb5c39e38779f0284460e01933e6
+P e8f192e2a93350a136d86bd9caceff65f52f3513
+R 6fdd4d4a128eec1805786ef3b8e11469
 U drh
-Z 8726398e2849afbae888397535f5fdc8
+Z 3ac24047ffee5278884ef0ae6103021c

diff --git a/manifest.uuid b/manifest.uuid
index 15dc0031b48dda0d128a4d15263a221125198caf..8f7070e911f151b4a336f3094c84a2e3577855d9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e8f192e2a93350a136d86bd9caceff65f52f3513
\ No newline at end of file
+193c871f3d16ce982040334c543610d330117bd5
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 2271edd173866b1807f60c617eb1f2a380a56f9d..9d400fef471e42e78b44f3d76a3bebd48e23e2fc 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.832 2009/02/05 16:31:46 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.833 2009/02/05 16:53:43 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -510,12 +510,10 @@ struct BusyHandler {
   #define sqlite3GlobalConfig GLOBAL(struct Sqlite3Config, sqlite3Config)
   int sqlite3_wsd_init(int N, int J);
   void *sqlite3_wsd_find(void *K, int L);
-  int sqlite3PendingByte;
 #else
   #define SQLITE_WSD 
   #define GLOBAL(t,v) v
   #define sqlite3GlobalConfig sqlite3Config
-  int sqlite3PendingByte;
 #endif
 
 /*
@@ -2533,6 +2531,7 @@ extern const unsigned char sqlite3UpperToLower[];
 extern const unsigned char sqlite3CtypeMap[];
 extern SQLITE_WSD struct Sqlite3Config sqlite3Config;
 extern SQLITE_WSD FuncDefHash sqlite3GlobalFunctions;
+extern int sqlite3PendingByte;
 #endif
 void sqlite3RootPageMoved(Db*, int, int);
 void sqlite3Reindex(Parse*, Token*, Token*);