Update Makefile.msc to include window.c in the build.

FossilOrigin-Name: 16db73842ade5eb0fe02f257b91d1c7b41d830d3f17f8638b8fbaed309d9a852

diff --git a/Makefile.msc b/Makefile.msc
index 8513996b6a0a887fcb55536368fe64cf3055cbc6..d31c117f5681b08e4f836d66b4bd82be6094f19f 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1196,7 +1196,7 @@ LIBOBJS0 = vdbe.lo parse.lo alter.lo analyze.lo attach.lo auth.lo \
          update.lo upsert.lo util.lo vacuum.lo \
          vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
          vdbetrace.lo wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
-         utf.lo vtab.lo
+         window.lo utf.lo vtab.lo
 # <</mark>>
 
 # Object files for the amalgamation.
@@ -1307,7 +1307,8 @@ SRC01 = \
   $(TOP)\src\walker.c \
   $(TOP)\src\where.c \
   $(TOP)\src\wherecode.c \
-  $(TOP)\src\whereexpr.c
+  $(TOP)\src\whereexpr.c \
+  $(TOP)\src\window.c
 
 # Core miscellaneous files.
 #
@@ -2046,6 +2047,9 @@ wherecode.lo:     $(TOP)\src\wherecode.c $(HDR)
 whereexpr.lo:  $(TOP)\src\whereexpr.c $(HDR)
        $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\whereexpr.c
 
+window.lo:     $(TOP)\src\window.c $(HDR)
+       $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\window.c
+
 tclsqlite.lo:  $(TOP)\src\tclsqlite.c $(HDR) $(SQLITE_TCL_DEP)
        $(LTCOMPILE) $(NO_WARN) -DUSE_TCL_STUBS=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
 

diff --git a/manifest b/manifest
index a86004ffdd4a063050c7a1c97a0f5506a2e8a1ea..b8c297e20a9f0ac1449bc71d103b4666fb43fd22 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C Merge\srecent\strunk\schanges\swith\sthis\sbranch.
-D 2018-06-09T18:09:44.345
+C Update\sMakefile.msc\sto\sinclude\swindow.c\sin\sthe\sbuild.
+D 2018-06-10T07:42:35.717
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 498b77b89a8cb42f2ee20fcd6317f279a45c0d6ff40d27825f94b69884c09bbe
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 681fb88cccf1fd58c0b9648f6a09b75332206ef72ca76012ad11699c320cec5f
+F Makefile.msc 0221c154ad20065906973f8fd4047346b995d31eaafd461383edca766f4282b6
 F README.md 7764d56778d567913ef11c82da9ab94aefa0826f7c243351e4e2d7adaef6f373
 F VERSION d3e3afdec1165a5e593dcdfffd8e0f33a2b0186067eb51a073ef6c4aec34923d
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -430,7 +430,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c 819b14b58e71565f8da505a9c1d5d9d904605f85cd64179cf9c7d1edcdad6c25
-F src/analyze.c 1250e69bd137314845afec5c489fc49c9de7baef68970b5530a7bc28f7611db1
+F src/analyze.c 41f0b8d638fc2a7309477904ac38e535f2aabea3256da3251e529730e099df77
 F src/attach.c 3af6abc40733d10014b401c89a4e8ecfa7c3855517c62004461875220a3af453
 F src/auth.c a38f3c63c974787ecf75e3213f8cac6568b9a7af7591fb0372ec0517dd16dca8
 F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
@@ -1740,7 +1740,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 21d2f4a62eceab0de0b4669bf3e81eb71512211ed710ce0eb525695fb7309d6b 538a365b7a32ab7fa84f59d7556242cfb59b76d287b6417eb3a823197a354e8e
-R 6acfedbb724c9a0a79fb2548396e647b
+P c71f23590c25b4cecd27722e6c0fc8e3bf320d399c7d9398b7016dd5cf5b05eb
+R 2e58ed5cf6d082d384917693b0e78747
 U dan
-Z fb63cabb1c512a4c919ea08381d46601
+Z 07d472def1abd4a4538bf4eac7a242cb

diff --git a/manifest.uuid b/manifest.uuid
index d4d8d10f24db84cbe3920e782537f528d8c08a56..aa655d22bb1fdaba00c40ca518af1f7e3c80b6e0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c71f23590c25b4cecd27722e6c0fc8e3bf320d399c7d9398b7016dd5cf5b05eb
\ No newline at end of file
+16db73842ade5eb0fe02f257b91d1c7b41d830d3f17f8638b8fbaed309d9a852
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index 9492e2c2f83b789e15ad6525aa304136bae6228e..c3fa50b1c39aa992630b44b0067fe0314f2c5912 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -485,7 +485,7 @@ static const FuncDef statInitFuncdef = {
   0,               /* pNext */
   statInit,        /* xSFunc */
   0,               /* xFinalize */
-  0, 0,
+  0, 0,            /* xValue, xInverse */
   "stat_init",     /* zName */
   {0}
 };
@@ -802,7 +802,7 @@ static const FuncDef statPushFuncdef = {
   0,               /* pNext */
   statPush,        /* xSFunc */
   0,               /* xFinalize */
-  0, 0,
+  0, 0,            /* xValue, xInverse */
   "stat_push",     /* zName */
   {0}
 };
@@ -954,7 +954,7 @@ static const FuncDef statGetFuncdef = {
   0,               /* pNext */
   statGet,         /* xSFunc */
   0,               /* xFinalize */
-  0, 0,
+  0, 0,            /* xValue, xInverse */
   "stat_get",      /* zName */
   {0}
 };