Skip to content

conditionally compile released SQLite on ifndef SQLITE_TRUNK #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oxtoacart merged 1 commit into from
Mar 4, 2026
Merged

conditionally compile released SQLite on ifndef SQLITE_TRUNK #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cgosqlite/cgosqlite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ package cgosqlite
// One exception is we do not use SQLITE_OMIT_DECLTYPE, as the design
// of the database/sql driver seems to require it.

#cgo !sqlite_trunk CFLAGS: -DSQLITE_RELEASE
#cgo sqlite_trunk CFLAGS: -DSQLITE_TRUNK
#cgo CFLAGS: -DSQLITE_THREADSAFE=2
#cgo CFLAGS: -DSQLITE_DQS=0
Expand Down
2 changes: 1 addition & 1 deletion cgosqlite/sqlite3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#ifdef SQLITE_RELEASE
#ifndef SQLITE_TRUNK

/******************************************************************************
** This file is an amalgamation of many separate C source files from SQLite
Expand Down
1 change: 1 addition & 0 deletions cgosqlite/sqlite3_trunk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69164,6 +69164,7 @@ static int walCheckpoint(
** the wal file. It would also be dangerous to proceed, as there may be
** fewer than pWal->hdr.mxFrame valid frames in the wal file. */
int bChg = memcmp(pLive->aSalt, pWal->hdr.aSalt, sizeof(pWal->hdr.aSalt));
if( bChg ) sqlite3_log(SQLITE_WARNING, "wal wrapped after header was read for this checkpoint");
if( 0==bChg ){
pInfo->nBackfillAttempted = mxSafeFrame; SEH_INJECT_FAULT;

Expand Down
2 changes: 1 addition & 1 deletion update-sqlite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ unzip "$filename" || fatal "Unzip of $filename failed"
mv "$dirname"/*.{c,h} .
mv shell.c shell.c.disabled
mv sqlite3.c sqlite3.c_partial
printf "#ifdef SQLITE_RELEASE\n\n" > sqlite3.c
printf "#ifndef SQLITE_TRUNK\n\n" > sqlite3.c
cat sqlite3.c_partial >> sqlite3.c
printf "\n\n#endif\n" >> sqlite3.c
rm sqlite3.c_partial
Loading