From d5f6ad13cfc6de367809c3a017abd709868b9a09 Mon Sep 17 00:00:00 2001 From: Paul Kulchenko Date: Wed, 23 Nov 2022 18:53:28 -0800 Subject: [PATCH] Update icu paths in SQLite (reapply 367d06d9) --- third_party/sqlite3/fts3_icu.c | 12 ++++-------- third_party/sqlite3/icu.c | 10 +++------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/third_party/sqlite3/fts3_icu.c b/third_party/sqlite3/fts3_icu.c index 277f18575..895e45fe3 100644 --- a/third_party/sqlite3/fts3_icu.c +++ b/third_party/sqlite3/fts3_icu.c @@ -15,14 +15,10 @@ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) #ifdef SQLITE_ENABLE_ICU -#include -#include -#include "fts3_tokenizer.h" - -#include -#include -#include -#include +#include "libc/assert.h" +#include "libc/str/str.h" +#include "libc/str/unicode.h" +#include "third_party/sqlite3/fts3_tokenizer.h" typedef struct IcuTokenizer IcuTokenizer; typedef struct IcuCursor IcuCursor; diff --git a/third_party/sqlite3/icu.c b/third_party/sqlite3/icu.c index 2af13d1cc..49c00090c 100644 --- a/third_party/sqlite3/icu.c +++ b/third_party/sqlite3/icu.c @@ -33,15 +33,11 @@ || defined(SQLITE_ENABLE_ICU_COLLATIONS) /* Include ICU headers */ -#include -#include -#include -#include - -#include +#include "libc/assert.h" +#include "libc/str/unicode.h" #ifndef SQLITE_CORE - #include "sqlite3ext.h" + #include "third_party/sqlite3/sqlite3ext.h" SQLITE_EXTENSION_INIT1 #else #include "third_party/sqlite3/sqlite3.h"