From: drh <drh@noemail.net>
Date: Fri, 13 Dec 2019 11:32:28 +0000 (+0000)
Subject: *Remove* the macros, not just comment them out.
X-Git-Tag: version-3.31.0~228
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d985985077695cc2a620c42194857f657c1a3e4;p=thirdparty%2Fsqlite.git

*Remove* the macros, not just comment them out.

FossilOrigin-Name: e5dc2939d3e8694d648fc9b73b1174da5b1349e20fbb9cf1c91268939f308f89
---

diff --git a/manifest b/manifest
index 398947f8f9..4401393389 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sunused\smacros\sformerly\sused\sto\sdefine\sbuilt-in\saggregate\sfunctions.
-D 2019-12-13T11:31:47.038
+C *Remove*\sthe\smacros,\snot\sjust\scomment\sthem\sout.
+D 2019-12-13T11:32:28.253
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -532,7 +532,7 @@ F src/shell.c.in 4a3a9e1c11847b1904f2b01d087af1c052f660902755abab457cab1756817de
 F src/sqlite.h.in 2a23e8161775253d9cf383c2c6aa559005dc787d350dcb0be67a6c4cc3bd1d19
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 72af51aa4e912e14cd495fb6e7fac65f0940db80ed950d90911aff292cc47ce2
-F src/sqliteInt.h 505a63c618e1c2033f9ee47b738212d6e1b7c883ade7f7adf4a9dd7092295f7c
+F src/sqliteInt.h 60d92fad64da7c3e77bbc35ee306340814cdaa5df32892b0ec58d306d99b5733
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1852,7 +1852,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 c6af9f655b73200ecc0c4189698e421af6ca584babdc76e73a36d468b2eea1f9
-R d8f751c039e582d2b1259f3edeb257b3
+P 3ef0d44edd0354cda9b6237f992cb67a2170ee8f1f464b1f38ac36e3a133bc71
+R c66b26e93f66260bbdfb9270348c2018
 U drh
-Z 93f716a2a579af670cbf84e12039b504
+Z 650bf9c9615ba772561498de4d1519e2
diff --git a/manifest.uuid b/manifest.uuid
index 62059fc08e..56422f5249 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3ef0d44edd0354cda9b6237f992cb67a2170ee8f1f464b1f38ac36e3a133bc71
\ No newline at end of file
+e5dc2939d3e8694d648fc9b73b1174da5b1349e20fbb9cf1c91268939f308f89
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 0d62e9f6e9..4b4a9068cc 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1767,14 +1767,6 @@ struct FuncDestructor {
 #define LIKEFUNC(zName, nArg, arg, flags) \
   {nArg, SQLITE_FUNC_CONSTANT|SQLITE_UTF8|flags, \
    (void *)arg, 0, likeFunc, 0, 0, 0, #zName, {0} }
-/*
-#define AGGREGATE(zName, nArg, arg, nc, xStep, xFinal, xValue) \
-  {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL), \
-   SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xValue,0,#zName, {0}}
-#define AGGREGATE2(zName, nArg, arg, nc, xStep, xFinal, extraFlags) \
-  {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL)|extraFlags, \
-   SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xFinal,0,#zName, {0}}
-*/
 #define WAGGREGATE(zName, nArg, arg, nc, xStep, xFinal, xValue, xInverse, f) \
   {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL)|f, \
    SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xValue,xInverse,#zName, {0}}