From: drh <drh@noemail.net>
Date: Tue, 13 Oct 2009 19:19:23 +0000 (+0000)
Subject: Fixed warnings with MSVC compile.
X-Git-Tag: fts3-refactor~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcb9f7ad7affbba5c46008fc76d649c14bef273b;p=thirdparty%2Fsqlite.git

Fixed warnings with MSVC compile.

FossilOrigin-Name: e0aa50c382a56bb02eaa589619b7e670006a26b3
---

diff --git a/manifest b/manifest
index 72b65ff3da..e4189ffbcf 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Fix\sa\stypo\sin\sthe\stest\sscript\sadded\sfor\sticket\s[5ee23731f15].
-D 2009-10-13T18:49:53
+C Fixed\swarnings\swith\sMSVC\scompile.
+D 2009-10-13T19:19:24
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4ca3f1dd6efa2075bcb27f4dc43eef749877740d
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -167,7 +164,7 @@ F src/select.c 1d0a13137532321b4364f964e46f057d271691e3
 F src/shell.c 270231b3f587f1f86391b9994fdfcd5d472c3fdf
 F src/sqlite.h.in 8e1ccddb12b5e983d0a17e1f1477c72b0a72dd84
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
-F src/sqliteInt.h 44cded4d6b78fe5fb5339454c44e51c64b7d8ed8
+F src/sqliteInt.h 4bacf6fd6986579a2c6d0f4eb7ecff312eb4acf5
 F src/sqliteLimit.h 38b2fffcd01faeaeaadea71b2b47695a81580c8b
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c cc86ad3d6ad54df7c63a3e807b5783c90411a08d
@@ -204,7 +201,7 @@ F src/test_tclvar.c 9e42fa59d3d2f064b7ab8628e7ab2dc8a9fe93d4
 F src/test_thread.c b8a1ab7ca1a632f18e8a361880d5d65eeea08eac
 F src/test_wsd.c 3ae5101de6cbfda2720152ab659ea84079719241
 F src/tokenize.c af8a56e6a50c5042fc305bfa796275e9bf26ff2b
-F src/trigger.c 643e27f94a0112071a993f457d6c4aae24782944
+F src/trigger.c 2053afa9952f69cf451bc0e6ea88072701f2925e
 F src/update.c 2c8a64237e4fae604468d14380b877d169545b63
 F src/utf.c 99cf927eabb104621ba889ac0dd075fc1657ad30
 F src/util.c 59d4e9456bf1fe581f415a783fa0cee6115c8f35
@@ -745,7 +742,7 @@ F tool/mkkeywordhash.c 8c9f8e3253555101aaa4bf7a0459cbfc8ddc41cc
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c.tcl 69dc8842a88d1f84c141e1a0bd2e42d8e859397f
-F tool/mksqlite3h.tcl eb100dce83f24b501b325b340f8b5eb8e5106b3b x
+F tool/mksqlite3h.tcl eb100dce83f24b501b325b340f8b5eb8e5106b3b
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -760,14 +757,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 1b3cfa01dd7fb9a48f0008f5afd974db61c30cff
-R b341be8e0fe34457030485ca725f5a0d
+P d0f55b5c3b1a85d837cd1d8a2f089c6bcf5a8c0d
+R 14f0ceddcb2ff3cfa9312dbf9b504c76
 U drh
-Z 299b7b7d82f5b740b9b23b97dff5d1da
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFK1MvXoxKgR168RlERAotoAJ0db9KOkVODvO9RFf3rni5bZpH7kQCfQ7Rm
-K7NC/wuJYvUGUq7pNnZfzZo=
-=8AEV
------END PGP SIGNATURE-----
+Z e78f9810a4297222a886e94c9a042ac1
diff --git a/manifest.uuid b/manifest.uuid
index c5e9b45bcd..467e916871 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d0f55b5c3b1a85d837cd1d8a2f089c6bcf5a8c0d
\ No newline at end of file
+e0aa50c382a56bb02eaa589619b7e670006a26b3
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 2675f44fb1..6a82cb7c45 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1005,7 +1005,7 @@ struct FuncDef {
 */
 struct Savepoint {
   char *zName;                        /* Savepoint name (nul-terminated) */
-  int nDeferredCons;                  /* Number of deferred fk violations */
+  i64 nDeferredCons;                  /* Number of deferred fk violations */
   Savepoint *pNext;                   /* Parent savepoint (if any) */
 };
 
diff --git a/src/trigger.c b/src/trigger.c
index 319f9bc70e..82acfbfed6 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -952,7 +952,7 @@ void sqlite3CodeRowTriggerDirect(
     ** invocation is disallowed if (a) the sub-program is really a trigger,
     ** not a foreign key action, and (b) the flag to enable recursive triggers
     ** is clear.  */
-    sqlite3VdbeChangeP5(v, p->zName && !(pParse->db->flags&SQLITE_RecTriggers));
+    sqlite3VdbeChangeP5(v, (u8)(p->zName && !(pParse->db->flags&SQLITE_RecTriggers)));
   }
 }
 
diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl
old mode 100755
new mode 100644