From: drh <>
Date: Thu, 15 Dec 2022 15:37:52 +0000 (+0000)
Subject: Omit the columnTypeImpl() function from the build when SQLITE_OMIT_DECLTYPE
X-Git-Tag: version-3.41.0~237
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f000c9b638bceb8d03d7ffa839531f5b0cb38ef3;p=thirdparty%2Fsqlite.git

Omit the columnTypeImpl() function from the build when SQLITE_OMIT_DECLTYPE
is defined, because it is no longer used in that case.

FossilOrigin-Name: 751e344f4cd2045caf97920cc9f4571caf0de1ba83b94ded902a03b36c10a389
---

diff --git a/manifest b/manifest
index 0ff7680c99..8d04e697ba 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings.
-D 2022-12-15T13:45:49.449
+C Omit\sthe\scolumnTypeImpl()\sfunction\sfrom\sthe\sbuild\swhen\sSQLITE_OMIT_DECLTYPE\nis\sdefined,\sbecause\sit\sis\sno\slonger\sused\sin\sthat\scase.
+D 2022-12-15T15:37:52.180
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -645,7 +645,7 @@ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 86ab35ea18c892b690f7fadb9b3e649ebb870cb13c0ac9a2363265f13ba69d5d
+F src/select.c a6c97f07b148ebf2e47c973b3ed292b43950da5bccec4a98f38ab7db6d6a0283
 F src/shell.c.in 47d491325ea7e01d9d4b7f6166a83fbfc6729b3d8a546d857d627a58a5d46d73
 F src/sqlite.h.in e752f82b9d71f1d42b259b1900e4b1caf0965e844d756cd5cc91cc2cf45ed925
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -2067,8 +2067,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 53e07dc6b6521bb7757d0bc2cf12a501bb929afafdb16737058496afca8e6742
-R 265cf09e20a8e7e80eda7ddd0d2db5ee
+P ddb260cc52efce6472b9423cbc6b788d8c38746f1842c9f1c184c08c651b3387
+R ff0fc441596dece1aed7130125ab1ebd
 U drh
-Z 626d584f8dfc162e968dcc5120876193
+Z 9b57f10c5bbacc31db1717d803b7b2d7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1a679abfbb..4335201d56 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ddb260cc52efce6472b9423cbc6b788d8c38746f1842c9f1c184c08c651b3387
\ No newline at end of file
+751e344f4cd2045caf97920cc9f4571caf0de1ba83b94ded902a03b36c10a389
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 192f32c52f..7ba1b8e93c 100644
--- a/src/select.c
+++ b/src/select.c
@@ -1870,6 +1870,7 @@ static void generateSortTail(
 #else /* if !defined(SQLITE_ENABLE_COLUMN_METADATA) */
 # define columnType(A,B,C,D,E) columnTypeImpl(A,B)
 #endif
+#ifndef SQLITE_OMIT_DECLTYPE
 static const char *columnTypeImpl(
   NameContext *pNC, 
 #ifndef SQLITE_ENABLE_COLUMN_METADATA
@@ -2016,6 +2017,7 @@ static const char *columnTypeImpl(
 #endif
   return zType;
 }
+#endif /* !defined(SQLITE_OMIT_DECLTYPE) */
 
 /*
 ** Generate code that will tell the VDBE the declaration types of columns