From 87852b221484fd70e4afb1cac4cff7389f990315 Mon Sep 17 00:00:00 2001 From: Paul Kulchenko Date: Wed, 23 Nov 2022 22:56:01 -0800 Subject: [PATCH] Update includes to use .inc extension These dependencies can't be individually compiled as .h files --- third_party/sqlite3/{btree.h => btree.inc} | 0 third_party/sqlite3/func.c | 2 +- third_party/sqlite3/{hwtime.h => hwtime.inc} | 0 .../sqlite3/{keywordhash.h => keywordhash.inc} | 0 third_party/sqlite3/{mutex.h => mutex.inc} | 0 third_party/sqlite3/{os.h => os.inc} | 0 third_party/sqlite3/os_common.h | 2 +- third_party/sqlite3/{pager.h => pager.inc} | 0 third_party/sqlite3/{pcache.h => pcache.inc} | 0 third_party/sqlite3/pragma.c | 2 +- third_party/sqlite3/{pragma.h => pragma.inc} | 0 third_party/sqlite3/sqlite3session.c | 2 +- third_party/sqlite3/sqliteInt.h | 12 ++++++------ third_party/sqlite3/status.c | 2 +- third_party/sqlite3/tokenize.c | 2 +- third_party/sqlite3/utf.c | 2 +- third_party/sqlite3/vacuum.c | 2 +- third_party/sqlite3/vdbe.c | 4 ++-- third_party/sqlite3/{vdbe.h => vdbe.inc} | 0 third_party/sqlite3/{vdbeInt.h => vdbeInt.inc} | 0 third_party/sqlite3/vdbeapi.c | 2 +- third_party/sqlite3/vdbeaux.c | 2 +- third_party/sqlite3/vdbeblob.c | 2 +- third_party/sqlite3/vdbemem.c | 2 +- third_party/sqlite3/vdbesort.c | 2 +- third_party/sqlite3/vdbetrace.c | 2 +- third_party/sqlite3/vdbevtab.c | 2 +- third_party/sqlite3/where.c | 2 +- third_party/sqlite3/{whereInt.h => whereInt.inc} | 0 third_party/sqlite3/wherecode.c | 2 +- third_party/sqlite3/whereexpr.c | 2 +- 31 files changed, 26 insertions(+), 26 deletions(-) rename third_party/sqlite3/{btree.h => btree.inc} (100%) rename third_party/sqlite3/{hwtime.h => hwtime.inc} (100%) rename third_party/sqlite3/{keywordhash.h => keywordhash.inc} (100%) rename third_party/sqlite3/{mutex.h => mutex.inc} (100%) rename third_party/sqlite3/{os.h => os.inc} (100%) rename third_party/sqlite3/{pager.h => pager.inc} (100%) rename third_party/sqlite3/{pcache.h => pcache.inc} (100%) rename third_party/sqlite3/{pragma.h => pragma.inc} (100%) rename third_party/sqlite3/{vdbe.h => vdbe.inc} (100%) rename third_party/sqlite3/{vdbeInt.h => vdbeInt.inc} (100%) rename third_party/sqlite3/{whereInt.h => whereInt.inc} (100%) diff --git a/third_party/sqlite3/btree.h b/third_party/sqlite3/btree.inc similarity index 100% rename from third_party/sqlite3/btree.h rename to third_party/sqlite3/btree.inc diff --git a/third_party/sqlite3/func.c b/third_party/sqlite3/func.c index 04b37c325..c454ca113 100644 --- a/third_party/sqlite3/func.c +++ b/third_party/sqlite3/func.c @@ -19,7 +19,7 @@ #ifndef SQLITE_OMIT_FLOATING_POINT #include "libc/math.h" #endif -#include "third_party/sqlite3/vdbeInt.h" +#include "third_party/sqlite3/vdbeInt.inc" /* clang-format off */ /* diff --git a/third_party/sqlite3/hwtime.h b/third_party/sqlite3/hwtime.inc similarity index 100% rename from third_party/sqlite3/hwtime.h rename to third_party/sqlite3/hwtime.inc diff --git a/third_party/sqlite3/keywordhash.h b/third_party/sqlite3/keywordhash.inc similarity index 100% rename from third_party/sqlite3/keywordhash.h rename to third_party/sqlite3/keywordhash.inc diff --git a/third_party/sqlite3/mutex.h b/third_party/sqlite3/mutex.inc similarity index 100% rename from third_party/sqlite3/mutex.h rename to third_party/sqlite3/mutex.inc diff --git a/third_party/sqlite3/os.h b/third_party/sqlite3/os.inc similarity index 100% rename from third_party/sqlite3/os.h rename to third_party/sqlite3/os.inc diff --git a/third_party/sqlite3/os_common.h b/third_party/sqlite3/os_common.h index aea1a8665..3aebe528f 100644 --- a/third_party/sqlite3/os_common.h +++ b/third_party/sqlite3/os_common.h @@ -39,7 +39,7 @@ ** hwtime.h contains inline assembler code for implementing ** high-performance timing routines. */ -#include "third_party/sqlite3/hwtime.h" +#include "third_party/sqlite3/hwtime.inc" static sqlite_uint64 g_start; static sqlite_uint64 g_elapsed; diff --git a/third_party/sqlite3/pager.h b/third_party/sqlite3/pager.inc similarity index 100% rename from third_party/sqlite3/pager.h rename to third_party/sqlite3/pager.inc diff --git a/third_party/sqlite3/pcache.h b/third_party/sqlite3/pcache.inc similarity index 100% rename from third_party/sqlite3/pcache.h rename to third_party/sqlite3/pcache.inc diff --git a/third_party/sqlite3/pragma.c b/third_party/sqlite3/pragma.c index 7faa27083..066e493cb 100644 --- a/third_party/sqlite3/pragma.c +++ b/third_party/sqlite3/pragma.c @@ -28,7 +28,7 @@ ** lexicographical order to facility a binary search of the pragma name. ** Do not edit pragma.h directly. Edit and rerun the script in at ** ../tool/mkpragmatab.tcl. */ -#include "third_party/sqlite3/pragma.h" +#include "third_party/sqlite3/pragma.inc" /* ** Interpret the given string as a safety level. Return 0 for OFF, diff --git a/third_party/sqlite3/pragma.h b/third_party/sqlite3/pragma.inc similarity index 100% rename from third_party/sqlite3/pragma.h rename to third_party/sqlite3/pragma.inc diff --git a/third_party/sqlite3/sqlite3session.c b/third_party/sqlite3/sqlite3session.c index f2492c084..9e4df183a 100644 --- a/third_party/sqlite3/sqlite3session.c +++ b/third_party/sqlite3/sqlite3session.c @@ -11,7 +11,7 @@ #ifndef SQLITE_AMALGAMATION # include "third_party/sqlite3/sqliteInt.h" -# include "third_party/sqlite3/vdbeInt.h" +# include "third_party/sqlite3/vdbeInt.inc" #endif typedef struct SessionTable SessionTable; diff --git a/third_party/sqlite3/sqliteInt.h b/third_party/sqlite3/sqliteInt.h index bca0d307a..a2189f437 100644 --- a/third_party/sqlite3/sqliteInt.h +++ b/third_party/sqlite3/sqliteInt.h @@ -1269,12 +1269,12 @@ typedef int VList; ** "BusyHandler" typedefs. vdbe.h also requires a few of the opaque ** pointer types (i.e. FuncDef) defined above. */ -#include "third_party/sqlite3/os.h" -#include "third_party/sqlite3/pager.h" -#include "third_party/sqlite3/btree.h" -#include "third_party/sqlite3/vdbe.h" -#include "third_party/sqlite3/pcache.h" -#include "third_party/sqlite3/mutex.h" +#include "third_party/sqlite3/os.inc" +#include "third_party/sqlite3/pager.inc" +#include "third_party/sqlite3/btree.inc" +#include "third_party/sqlite3/vdbe.inc" +#include "third_party/sqlite3/pcache.inc" +#include "third_party/sqlite3/mutex.inc" /* The SQLITE_EXTRA_DURABLE compile-time option used to set the default ** synchronous setting to EXTRA. It is no longer supported. diff --git a/third_party/sqlite3/status.c b/third_party/sqlite3/status.c index fb99a3265..64802dbc9 100644 --- a/third_party/sqlite3/status.c +++ b/third_party/sqlite3/status.c @@ -14,7 +14,7 @@ ** functionality. */ #include "third_party/sqlite3/sqliteInt.h" -#include "third_party/sqlite3/vdbeInt.h" +#include "third_party/sqlite3/vdbeInt.inc" /* ** Variables in which to record status information. diff --git a/third_party/sqlite3/tokenize.c b/third_party/sqlite3/tokenize.c index 81feece30..299cf9a14 100644 --- a/third_party/sqlite3/tokenize.c +++ b/third_party/sqlite3/tokenize.c @@ -145,7 +145,7 @@ const unsigned char ebcdicToAscii[] = { ** named keywordhash.h and then included into this source file by ** the #include below. */ -#include "third_party/sqlite3/keywordhash.h" +#include "third_party/sqlite3/keywordhash.inc" /* ** If X is a character that can be used in an identifier then diff --git a/third_party/sqlite3/utf.c b/third_party/sqlite3/utf.c index ffc64fc6c..ed0846da0 100644 --- a/third_party/sqlite3/utf.c +++ b/third_party/sqlite3/utf.c @@ -35,7 +35,7 @@ */ #include "third_party/sqlite3/sqliteInt.h" #include "libc/assert.h" -#include "third_party/sqlite3/vdbeInt.h" +#include "third_party/sqlite3/vdbeInt.inc" #if !defined(SQLITE_AMALGAMATION) && SQLITE_BYTEORDER==0 /* diff --git a/third_party/sqlite3/vacuum.c b/third_party/sqlite3/vacuum.c index 5426d4365..b81a721ef 100644 --- a/third_party/sqlite3/vacuum.c +++ b/third_party/sqlite3/vacuum.c @@ -15,7 +15,7 @@ ** SQLITE_OMIT_VACUUM macro. */ #include "third_party/sqlite3/sqliteInt.h" -#include "third_party/sqlite3/vdbeInt.h" +#include "third_party/sqlite3/vdbeInt.inc" #if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH) diff --git a/third_party/sqlite3/vdbe.c b/third_party/sqlite3/vdbe.c index b4f14355a..7f9f502bf 100644 --- a/third_party/sqlite3/vdbe.c +++ b/third_party/sqlite3/vdbe.c @@ -19,7 +19,7 @@ ** commenting and indentation practices when changing or adding code. */ #include "third_party/sqlite3/sqliteInt.h" -#include "third_party/sqlite3/vdbeInt.h" +#include "third_party/sqlite3/vdbeInt.inc" /* ** Invoke this macro on memory cells just prior to changing the @@ -624,7 +624,7 @@ void sqlite3VdbeRegisterDump(Vdbe *v){ ** hwtime.h contains inline assembler code for implementing ** high-performance timing routines. */ -#include "third_party/sqlite3/hwtime.h" +#include "third_party/sqlite3/hwtime.inc" #endif diff --git a/third_party/sqlite3/vdbe.h b/third_party/sqlite3/vdbe.inc similarity index 100% rename from third_party/sqlite3/vdbe.h rename to third_party/sqlite3/vdbe.inc diff --git a/third_party/sqlite3/vdbeInt.h b/third_party/sqlite3/vdbeInt.inc similarity index 100% rename from third_party/sqlite3/vdbeInt.h rename to third_party/sqlite3/vdbeInt.inc diff --git a/third_party/sqlite3/vdbeapi.c b/third_party/sqlite3/vdbeapi.c index add90fb6c..f512e956b 100644 --- a/third_party/sqlite3/vdbeapi.c +++ b/third_party/sqlite3/vdbeapi.c @@ -14,7 +14,7 @@ ** VDBE. */ #include "third_party/sqlite3/sqliteInt.h" -#include "third_party/sqlite3/vdbeInt.h" +#include "third_party/sqlite3/vdbeInt.inc" #ifndef SQLITE_OMIT_DEPRECATED /* diff --git a/third_party/sqlite3/vdbeaux.c b/third_party/sqlite3/vdbeaux.c index 4b3ae2a43..a7870659e 100644 --- a/third_party/sqlite3/vdbeaux.c +++ b/third_party/sqlite3/vdbeaux.c @@ -13,7 +13,7 @@ ** a VDBE (or an "sqlite3_stmt" as it is known to the outside world.) */ #include "third_party/sqlite3/sqliteInt.h" -#include "third_party/sqlite3/vdbeInt.h" +#include "third_party/sqlite3/vdbeInt.inc" /* Forward references */ static void freeEphemeralFunction(sqlite3 *db, FuncDef *pDef); diff --git a/third_party/sqlite3/vdbeblob.c b/third_party/sqlite3/vdbeblob.c index a9d3a7a62..f70190b9d 100644 --- a/third_party/sqlite3/vdbeblob.c +++ b/third_party/sqlite3/vdbeblob.c @@ -14,7 +14,7 @@ */ #include "third_party/sqlite3/sqliteInt.h" -#include "third_party/sqlite3/vdbeInt.h" +#include "third_party/sqlite3/vdbeInt.inc" #ifndef SQLITE_OMIT_INCRBLOB diff --git a/third_party/sqlite3/vdbemem.c b/third_party/sqlite3/vdbemem.c index c41620e18..c895ad720 100644 --- a/third_party/sqlite3/vdbemem.c +++ b/third_party/sqlite3/vdbemem.c @@ -16,7 +16,7 @@ ** name sqlite_value */ #include "third_party/sqlite3/sqliteInt.h" -#include "third_party/sqlite3/vdbeInt.h" +#include "third_party/sqlite3/vdbeInt.inc" /* True if X is a power of two. 0 is considered a power of two here. ** In other words, return true if X has at most one bit set. diff --git a/third_party/sqlite3/vdbesort.c b/third_party/sqlite3/vdbesort.c index 6412f483c..ca78d5d4a 100644 --- a/third_party/sqlite3/vdbesort.c +++ b/third_party/sqlite3/vdbesort.c @@ -136,7 +136,7 @@ ** the main thread to read from. */ #include "third_party/sqlite3/sqliteInt.h" -#include "third_party/sqlite3/vdbeInt.h" +#include "third_party/sqlite3/vdbeInt.inc" /* ** If SQLITE_DEBUG_SORTER_THREADS is defined, this module outputs various diff --git a/third_party/sqlite3/vdbetrace.c b/third_party/sqlite3/vdbetrace.c index b8e305176..feeeed1fe 100644 --- a/third_party/sqlite3/vdbetrace.c +++ b/third_party/sqlite3/vdbetrace.c @@ -16,7 +16,7 @@ ** The Vdbe parse-tree explainer is also found here. */ #include "third_party/sqlite3/sqliteInt.h" -#include "third_party/sqlite3/vdbeInt.h" +#include "third_party/sqlite3/vdbeInt.inc" #ifndef SQLITE_OMIT_TRACE diff --git a/third_party/sqlite3/vdbevtab.c b/third_party/sqlite3/vdbevtab.c index 74ab364f5..e7f1aae40 100644 --- a/third_party/sqlite3/vdbevtab.c +++ b/third_party/sqlite3/vdbevtab.c @@ -15,7 +15,7 @@ */ #include "third_party/sqlite3/sqliteInt.h" #if defined(SQLITE_ENABLE_BYTECODE_VTAB) && !defined(SQLITE_OMIT_VIRTUALTABLE) -#include "third_party/sqlite3/vdbeInt.h" +#include "third_party/sqlite3/vdbeInt.inc" /* An instance of the bytecode() table-valued function. */ diff --git a/third_party/sqlite3/where.c b/third_party/sqlite3/where.c index 1232d5ab4..498883b45 100644 --- a/third_party/sqlite3/where.c +++ b/third_party/sqlite3/where.c @@ -17,7 +17,7 @@ ** indices, you might also think of this module as the "query optimizer". */ #include "third_party/sqlite3/sqliteInt.h" -#include "third_party/sqlite3/whereInt.h" +#include "third_party/sqlite3/whereInt.inc" #if __GNUC__ >= 11 #pragma GCC diagnostic ignored "-Wmisleading-indentation" diff --git a/third_party/sqlite3/whereInt.h b/third_party/sqlite3/whereInt.inc similarity index 100% rename from third_party/sqlite3/whereInt.h rename to third_party/sqlite3/whereInt.inc diff --git a/third_party/sqlite3/wherecode.c b/third_party/sqlite3/wherecode.c index 999ed6fed..abf76b26c 100644 --- a/third_party/sqlite3/wherecode.c +++ b/third_party/sqlite3/wherecode.c @@ -18,7 +18,7 @@ ** file retains the code that does query planning and analysis. */ #include "third_party/sqlite3/sqliteInt.h" -#include "third_party/sqlite3/whereInt.h" +#include "third_party/sqlite3/whereInt.inc" #ifndef SQLITE_OMIT_EXPLAIN diff --git a/third_party/sqlite3/whereexpr.c b/third_party/sqlite3/whereexpr.c index e7bda725a..42b14c173 100644 --- a/third_party/sqlite3/whereexpr.c +++ b/third_party/sqlite3/whereexpr.c @@ -17,7 +17,7 @@ ** analyzing Expr objects in the WHERE clause. */ #include "third_party/sqlite3/sqliteInt.h" -#include "third_party/sqlite3/whereInt.h" +#include "third_party/sqlite3/whereInt.inc" /* Forward declarations */ static void exprAnalyze(SrcList*, WhereClause*, int);