From: drh Date: Fri, 21 Sep 2007 12:43:16 +0000 (+0000) Subject: Remove "const" keywords from the sqlite3_index_info structure definition. X-Git-Tag: version-3.6.10~1732 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6cca08c274243d8cd8b1ea1cb6bd27fc3189ef00;p=thirdparty%2Fsqlite.git Remove "const" keywords from the sqlite3_index_info structure definition. The use of this keyword is suspected to be causing problems for some compilers. (CVS 4445) FossilOrigin-Name: 005d780de6e9e377ee296ff576e58cf1b512f245 --- diff --git a/manifest b/manifest index 800d31b159..7857dd6cce 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Another\scomment\stypo.\sAlso\s#2660.\s(CVS\s4444) -D 2007-09-21T04:28:16 +C Remove\s"const"\skeywords\sfrom\sthe\ssqlite3_index_info\sstructure\sdefinition.\nThe\suse\sof\sthis\skeyword\sis\ssuspected\sto\sbe\scausing\sproblems\sfor\ssome\ncompilers.\s(CVS\s4445) +D 2007-09-21T12:43:17 F Makefile.in cbfb898945536a8f9ea8b897e1586dd1fdbcc5db F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -130,7 +130,7 @@ F src/random.c 4a22746501bf36b0a088c66e38dde5daba6a35da F src/select.c 4706a6115da1bdc09a2be5991168a6cc2c0df267 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96 F src/shell.c 82089379833e361ba8a2ae65316a2173785300c0 -F src/sqlite.h.in 4ebbcb5a784493b6afb36fd83101e9c2e6d56707 +F src/sqlite.h.in 38c150bfb76c1792a93c9897ee774b5a20f0f3da F src/sqlite3ext.h a93f59cdee3638dc0c9c086f80df743a4e68c3cb F src/sqliteInt.h ab7d3169cbfa911335fd94a61f22f052a9f5adeb F src/sqliteLimit.h 1bcbbdfa856f8b71b561abb31edb864b0eca1d12 @@ -580,7 +580,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 02c8d60bea36825c1c763bbf2c6107869915aafd -R 26f60cec43fbbd2fed153e354fa71efb -U danielk1977 -Z 0d7ecaf11718e90dcf428c6ef77ca563 +P 0c1e6f69cd55ced4af5dcfbeff04820ba0d5b051 +R d221fe17dbb1bc5aa1e2a7f9106dccf9 +U drh +Z 4f0e3e4d1c3098ab0e3fee9b7e54dbbb diff --git a/manifest.uuid b/manifest.uuid index 6c4365d5f1..c4d180c355 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0c1e6f69cd55ced4af5dcfbeff04820ba0d5b051 \ No newline at end of file +005d780de6e9e377ee296ff576e58cf1b512f245 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 225e9816d6..c3c1dcaf35 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -30,7 +30,7 @@ ** the version number) and changes its name to "sqlite3.h" as ** part of the build process. ** -** @(#) $Id: sqlite.h.in,v 1.262 2007/09/21 04:27:03 danielk1977 Exp $ +** @(#) $Id: sqlite.h.in,v 1.263 2007/09/21 12:43:17 drh Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -3083,24 +3083,24 @@ struct sqlite3_module { */ struct sqlite3_index_info { /* Inputs */ - const int nConstraint; /* Number of entries in aConstraint */ - const struct sqlite3_index_constraint { + int nConstraint; /* Number of entries in aConstraint */ + struct sqlite3_index_constraint { int iColumn; /* Column on left-hand side of constraint */ unsigned char op; /* Constraint operator */ unsigned char usable; /* True if this constraint is usable */ int iTermOffset; /* Used internally - xBestIndex should ignore */ - } *const aConstraint; /* Table of WHERE clause constraints */ - const int nOrderBy; /* Number of terms in the ORDER BY clause */ - const struct sqlite3_index_orderby { + } *aConstraint; /* Table of WHERE clause constraints */ + int nOrderBy; /* Number of terms in the ORDER BY clause */ + struct sqlite3_index_orderby { int iColumn; /* Column number */ unsigned char desc; /* True for DESC. False for ASC. */ - } *const aOrderBy; /* The ORDER BY clause */ + } *aOrderBy; /* The ORDER BY clause */ /* Outputs */ struct sqlite3_index_constraint_usage { int argvIndex; /* if >0, constraint is part of argv to xFilter */ unsigned char omit; /* Do not code a test for this constraint */ - } *const aConstraintUsage; + } *aConstraintUsage; int idxNum; /* Number used to identify the index */ char *idxStr; /* String, possibly obtained from sqlite3_malloc */ int needToFreeIdxStr; /* Free idxStr using sqlite3_free() if true */