From dd14ec87dac3b02708c12582637ba6905c7f81d7 Mon Sep 17 00:00:00 2001
From: Paul Kulchenko <paul@kulchenko.com>
Date: Tue, 22 Nov 2022 21:08:59 -0800
Subject: [PATCH] Fix SQLite include paths

---
 third_party/sqlite3/main.c         | 6 +++---
 third_party/sqlite3/os_common.h    | 2 +-
 third_party/sqlite3/pragma.c       | 2 +-
 third_party/sqlite3/sqlite3rtree.h | 2 +-
 third_party/sqlite3/tokenize.c     | 3 +--
 third_party/sqlite3/vdbe.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/wherecode.c    | 2 +-
 third_party/sqlite3/whereexpr.c    | 2 +-
 third_party/sqlite3/zipfile.c      | 1 +
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/third_party/sqlite3/main.c b/third_party/sqlite3/main.c
index a3c73a4cd..3210034f4 100644
--- a/third_party/sqlite3/main.c
+++ b/third_party/sqlite3/main.c
@@ -17,13 +17,13 @@
 #include "third_party/sqlite3/sqliteInt.h"
 
 #ifdef SQLITE_ENABLE_FTS3
-# include "fts3.h"
+# include "third_party/sqlite3/fts3.h"
 #endif
 #ifdef SQLITE_ENABLE_RTREE
-# include "rtree.h"
+# include "third_party/sqlite3/rtree.h"
 #endif
 #if defined(SQLITE_ENABLE_ICU) || defined(SQLITE_ENABLE_ICU_COLLATIONS)
-# include "sqliteicu.h"
+# include "third_party/sqlite3/sqliteicu.h"
 #endif
 
 /*
diff --git a/third_party/sqlite3/os_common.h b/third_party/sqlite3/os_common.h
index 1ed4d7a8e..aea1a8665 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 "hwtime.h"
+#include "third_party/sqlite3/hwtime.h"
 
 static sqlite_uint64 g_start;
 static sqlite_uint64 g_elapsed;
diff --git a/third_party/sqlite3/pragma.c b/third_party/sqlite3/pragma.c
index f8180b867..7faa27083 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 "pragma.h"
+#include "third_party/sqlite3/pragma.h"
 
 /*
 ** Interpret the given string as a safety level.  Return 0 for OFF,
diff --git a/third_party/sqlite3/sqlite3rtree.h b/third_party/sqlite3/sqlite3rtree.h
index 9976c2d28..87e51ab43 100644
--- a/third_party/sqlite3/sqlite3rtree.h
+++ b/third_party/sqlite3/sqlite3rtree.h
@@ -14,7 +14,7 @@
 #ifndef _SQLITE3RTREE_H_
 #define _SQLITE3RTREE_H_
 
-#include <sqlite3.h>
+#include "third_party/sqlite3/sqlite3.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/third_party/sqlite3/tokenize.c b/third_party/sqlite3/tokenize.c
index db5317db6..81feece30 100644
--- a/third_party/sqlite3/tokenize.c
+++ b/third_party/sqlite3/tokenize.c
@@ -145,8 +145,7 @@ const unsigned char ebcdicToAscii[] = {
 ** named keywordhash.h and then included into this source file by
 ** the #include below.
 */
-#include "keywordhash.h"
-
+#include "third_party/sqlite3/keywordhash.h"
 
 /*
 ** If X is a character that can be used in an identifier then
diff --git a/third_party/sqlite3/vdbe.c b/third_party/sqlite3/vdbe.c
index 26fd56e9f..b4f14355a 100644
--- a/third_party/sqlite3/vdbe.c
+++ b/third_party/sqlite3/vdbe.c
@@ -624,7 +624,7 @@ void sqlite3VdbeRegisterDump(Vdbe *v){
 ** hwtime.h contains inline assembler code for implementing 
 ** high-performance timing routines.
 */
-#include "hwtime.h"
+#include "third_party/sqlite3/hwtime.h"
 
 #endif
 
diff --git a/third_party/sqlite3/vdbeblob.c b/third_party/sqlite3/vdbeblob.c
index bda3f7c26..a9d3a7a62 100644
--- a/third_party/sqlite3/vdbeblob.c
+++ b/third_party/sqlite3/vdbeblob.c
@@ -14,7 +14,7 @@
 */
 
 #include "third_party/sqlite3/sqliteInt.h"
-#include "vdbeInt.h"
+#include "third_party/sqlite3/vdbeInt.h"
 
 #ifndef SQLITE_OMIT_INCRBLOB
 
diff --git a/third_party/sqlite3/vdbemem.c b/third_party/sqlite3/vdbemem.c
index e296688be..c41620e18 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 "vdbeInt.h"
+#include "third_party/sqlite3/vdbeInt.h"
 
 /* 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 95cd3fbcc..6412f483c 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 "vdbeInt.h"
+#include "third_party/sqlite3/vdbeInt.h"
 
 /* 
 ** 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 cf887a22f..b8e305176 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 "vdbeInt.h"
+#include "third_party/sqlite3/vdbeInt.h"
 
 #ifndef SQLITE_OMIT_TRACE
 
diff --git a/third_party/sqlite3/vdbevtab.c b/third_party/sqlite3/vdbevtab.c
index aa97fe5da..74ab364f5 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 "vdbeInt.h"
+#include "third_party/sqlite3/vdbeInt.h"
 
 /* An instance of the bytecode() table-valued function.
 */
diff --git a/third_party/sqlite3/where.c b/third_party/sqlite3/where.c
index 6c92d15a8..cdc497317 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 "whereInt.h"
+#include "third_party/sqlite3/whereInt.h"
 
 /*
 ** Extra information appended to the end of sqlite3_index_info but not
diff --git a/third_party/sqlite3/wherecode.c b/third_party/sqlite3/wherecode.c
index 0252a9490..999ed6fed 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 "whereInt.h"
+#include "third_party/sqlite3/whereInt.h"
 
 #ifndef SQLITE_OMIT_EXPLAIN
 
diff --git a/third_party/sqlite3/whereexpr.c b/third_party/sqlite3/whereexpr.c
index e8bdaf8de..e7bda725a 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 "whereInt.h"
+#include "third_party/sqlite3/whereInt.h"
 
 /* Forward declarations */
 static void exprAnalyze(SrcList*, WhereClause*, int);
diff --git a/third_party/sqlite3/zipfile.c b/third_party/sqlite3/zipfile.c
index f64be11d1..2aede0bc3 100644
--- a/third_party/sqlite3/zipfile.c
+++ b/third_party/sqlite3/zipfile.c
@@ -29,6 +29,7 @@
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/s.h"
+#include "third_party/sqlite3/sqlite3.h"
 #include "third_party/sqlite3/sqlite3ext.h"
 #include "third_party/zlib/zlib.h"
 // clang-format off