Add proposed interface change to sqlite.h.in. This commit breaks the build.

FossilOrigin-Name: 52577bb5e723d8de4fc609286666b581f8d9c746

diff --git a/manifest b/manifest
index 11f38150d0ac294efe8060b101d75ddc8307acce..332b5c5abd13dc424c07932aee43c8bfcb57a4d2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sto\sthe\spcache10\sand\spcache90\spermutations.
-D 2010-07-13T14:22:40
+C Add\sproposed\sinterface\schange\sto\ssqlite.h.in.\sThis\scommit\sbreaks\sthe\sbuild.
+D 2010-07-13T14:33:49
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -170,7 +170,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c 4903ff1bbd08b55cbce00ea43c645530de41b362
 F src/shell.c fd4ccdb37c3b68de0623eb938a649e0990710714
-F src/sqlite.h.in 26bcfc3084a2e4b4debba311c59ae434820c8e98
+F src/sqlite.h.in 1754955ca803b9479a1c91bc130ed2b2a34881fd
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
 F src/sqliteInt.h 8eb5d1c63fff70ed30f4b861aeaf8485e663129c
 F src/sqliteLimit.h 196e2f83c3b444c4548fc1874f52f84fdbda40f3
@@ -834,7 +834,10 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 05ac2548652f3c9aa358289700b0b4c7fc22486d
-R d7ea8bae5d34f266c6513da1f61674ff
+P 597d40fa529073123a50ae6afc762c59404f8f5f
+R ec28c223e3c329a098d28619c616593d
+T *branch * experimental
+T *sym-experimental *
+T -sym-trunk *
 U dan
-Z a4fee7d380a1fd69eda8299369e35825
+Z 58b237093868dc094fa68b8a64f2879f

diff --git a/manifest.uuid b/manifest.uuid
index 0638988b8eb7683cd66fe08597872bb76ba658a3..551386122d7d5b90e16c6131cc5c630b3cfaa855 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-597d40fa529073123a50ae6afc762c59404f8f5f
\ No newline at end of file
+52577bb5e723d8de4fc609286666b581f8d9c746
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 1c1f42441b516823a461b9d84bc1c70be23983c4..162a4bf3cec8df715b08d0196d251cffde17a34b 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -660,11 +660,10 @@ struct sqlite3_io_methods {
   int (*xSectorSize)(sqlite3_file*);
   int (*xDeviceCharacteristics)(sqlite3_file*);
   /* Methods above are valid for version 1 */
-  int (*xShmOpen)(sqlite3_file*);
+  int (*xShmMap)(sqlite3_file*, int iPg, int pgsz, int, int*, void volatile**);
   int (*xShmLock)(sqlite3_file*, int offset, int n, int flags);
-  int (*xShmMap)(sqlite3_file*, int iPage, int pgsz, int, void volatile**);
   void (*xShmBarrier)(sqlite3_file*);
-  int (*xShmClose)(sqlite3_file*, int deleteFlag);
+  int (*xShmUnmap)(sqlite3_file*, int deleteFlag);
   /* Methods above are valid for version 2 */
   /* Additional methods may be added in future releases */
 };