Fix SQLite3 build for Landlock Make

This commit is contained in:
Justine Tunney 2022-12-11 14:49:53 -08:00
parent ed161b240e
commit 4922bc4890
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
7 changed files with 28 additions and 14 deletions

View file

@ -1,3 +1,4 @@
// clang-format off
/* DO NOT EDIT! /* DO NOT EDIT!
** This file is automatically generated by the script in the canonical ** This file is automatically generated by the script in the canonical
** SQLite source tree at tool/mkctimec.tcl. ** SQLite source tree at tool/mkctimec.tcl.
@ -28,7 +29,7 @@
** autoconf-based build ** autoconf-based build
*/ */
#if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H) #if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H)
#include "sqlite_cfg.h" // #include "third_party/sqlite3/sqlite_cfg.h"
#define SQLITECONFIG_H 1 #define SQLITECONFIG_H 1
#endif #endif

View file

@ -1,3 +1,4 @@
// clang-format off
/* /*
** 2001 September 15 ** 2001 September 15
** **
@ -17,13 +18,13 @@
#include "third_party/sqlite3/sqliteInt.h" #include "third_party/sqlite3/sqliteInt.h"
#ifdef SQLITE_ENABLE_FTS3 #ifdef SQLITE_ENABLE_FTS3
# include "third_party/sqlite3/fts3.h" #include "third_party/sqlite3/fts3.h"
#endif #endif
#ifdef SQLITE_ENABLE_RTREE #ifdef SQLITE_ENABLE_RTREE
# include "third_party/sqlite3/rtree.h" #include "third_party/sqlite3/rtree.h"
#endif #endif
#if defined(SQLITE_ENABLE_ICU) || defined(SQLITE_ENABLE_ICU_COLLATIONS) #if defined(SQLITE_ENABLE_ICU) || defined(SQLITE_ENABLE_ICU_COLLATIONS)
# include "third_party/sqlite3/sqliteicu.h" #include "third_party/sqlite3/sqliteicu.h"
#endif #endif
/* /*

View file

@ -112,13 +112,23 @@
#include "libc/mem/mem.h" #include "libc/mem/mem.h"
#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0 #if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
#include "libc/isystem/sys/mman.h" #include "libc/calls/calls.h"
#include "libc/sysv/consts/map.h"
#endif #endif
#if SQLITE_ENABLE_LOCKING_STYLE #if SQLITE_ENABLE_LOCKING_STYLE
# include "libc/isystem/sys/ioctl.h" #include "libc/calls/ioctl.h"
# include "libc/isystem/sys/file.h" #include "libc/calls/struct/winsize.h"
# include "libc/isystem/sys/param.h" #include "libc/sysv/consts/fd.h"
#include "libc/sysv/consts/fio.h"
#include "libc/calls/struct/flock.h"
#include "libc/sysv/consts/l.h"
#include "libc/sysv/consts/lock.h"
#include "libc/sysv/consts/ok.h"
#include "libc/calls/struct/rlimit.h"
#include "libc/calls/struct/rusage.h"
#include "libc/calls/sysparam.h"
#include "libc/limits.h"
#endif /* SQLITE_ENABLE_LOCKING_STYLE */ #endif /* SQLITE_ENABLE_LOCKING_STYLE */
/* /*
@ -302,7 +312,7 @@ static pid_t randomnessPid = 0;
/* /*
** Include code that is common to all os_*.c files ** Include code that is common to all os_*.c files
*/ */
#include "os_common.h" #include "third_party/sqlite3/os_common.h"
/* /*
** Define various macros that are missing from some systems. ** Define various macros that are missing from some systems.

View file

@ -180,7 +180,7 @@ typedef unsigned char u8;
#elif HAVE_LINENOISE #elif HAVE_LINENOISE
# include "third_party/linenoise/linenoise.h" #include "third_party/linenoise/linenoise.h"
# define shell_add_history(X) linenoiseHistoryAdd(X) # define shell_add_history(X) linenoiseHistoryAdd(X)
# define shell_read_history(X) linenoiseHistoryLoad(X) # define shell_read_history(X) linenoiseHistoryLoad(X)
# define shell_write_history(X) linenoiseHistorySave(X) # define shell_write_history(X) linenoiseHistorySave(X)

View file

@ -1,3 +1,4 @@
// clang-format off
/* /*
** 2014 August 30 ** 2014 August 30
** **
@ -90,7 +91,7 @@
#include "third_party/sqlite3/sqlite3rbu.h" #include "third_party/sqlite3/sqlite3rbu.h"
#if defined(_WIN32_WCE) #if defined(_WIN32_WCE)
#include "windows.h" // #include "third_party/sqlite3/windows.h"
#endif #endif
/* Maximum number of prepared UPDATE statements held by this module */ /* Maximum number of prepared UPDATE statements held by this module */

View file

@ -10,8 +10,8 @@
#endif #endif
#ifndef SQLITE_AMALGAMATION #ifndef SQLITE_AMALGAMATION
# include "third_party/sqlite3/sqliteInt.h" #include "third_party/sqlite3/sqliteInt.h"
# include "third_party/sqlite3/vdbeInt.inc" #include "third_party/sqlite3/vdbeInt.inc"
#endif #endif
typedef struct SessionTable SessionTable; typedef struct SessionTable SessionTable;

View file

@ -1,3 +1,4 @@
// clang-format off
/* /*
** 2001 September 15 ** 2001 September 15
** **
@ -208,7 +209,7 @@
** autoconf-based build ** autoconf-based build
*/ */
#if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H) #if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H)
#include "sqlite_cfg.h" // #include "third_party/sqlite3/sqlite_cfg.h"
#define SQLITECONFIG_H 1 #define SQLITECONFIG_H 1
#endif #endif