From: stephan <stephan@noemail.net>
Date: Mon, 3 Jun 2024 07:22:28 +0000 (+0000)
Subject: Modify three #if checks in os_unix.c to improve handling of SQLITE_OMIT_WAL on WASI... 
X-Git-Tag: version-3.47.0~362
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1b55a5af9d65aa33d6fcfb68e9a998bd2af0985;p=thirdparty%2Fsqlite.git

Modify three #if checks in os_unix.c to improve handling of SQLITE_OMIT_WAL on WASI builds. Based on the discussion in/around [forum:57e918431735128a|forum post 57e918431735128a].

FossilOrigin-Name: 296eeb26c816bc734530cf446922f25be970b901c884df1a98083502f0d1e9f5
---

diff --git a/manifest b/manifest
index 8a3110d657..ba1bfaab11 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\seven\stry\sstar-schema\sdetection\sif\sthe\sjoin\shas\sfewer\sthan\s5\stables,\nsince\s5\sis\sthe\sminimum\sfor\sa\spositive\sdetection.
-D 2024-05-31T15:39:00.555
+C Modify\sthree\s#if\schecks\sin\sos_unix.c\sto\simprove\shandling\sof\sSQLITE_OMIT_WAL\son\sWASI\sbuilds.\sBased\son\sthe\sdiscussion\sin/around\s[forum:57e918431735128a|forum\spost\s57e918431735128a].
+D 2024-06-03T07:22:28.518
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -739,7 +739,7 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
 F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
 F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
-F src/os_unix.c 6227cbc4ac93046f121436886cf3712da6f4e2082af6314f976eeae1d86b794a
+F src/os_unix.c 08ca53844f4bf8eafb18b0a9076c84afac41da912315a5cfbe9e704d4c10c090
 F src/os_win.c 6ff43bac175bd9ed79e7c0f96840b139f2f51d01689a638fd05128becf94908a
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 9beb80f6e330dd63c5d8ba0f7a7f3a55fff22067a68d424949c389bfc6fa0c56
@@ -2194,8 +2194,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 996c46e61d9a53a54018672dd407b8ba8c480dd6795393428f9d5fcb81b47ab5
-R a2ca0792af2e5fd1149a2be149730242
-U drh
-Z dd2c4dbd585f8635955a8cbd6ced885b
+P a07ec16bbc056fbc23a7bd58e5e32ef691c13e9babeb542918cf9a01cac40c20
+R ec4b0ef096bbb322e89f9c8b12d64294
+U stephan
+Z a28a63e6360f258a971f7c4657c7b09e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2b915c652e..8f3cb376e3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a07ec16bbc056fbc23a7bd58e5e32ef691c13e9babeb542918cf9a01cac40c20
\ No newline at end of file
+296eeb26c816bc734530cf446922f25be970b901c884df1a98083502f0d1e9f5
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 9e7ba05d68..c61b19060c 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3987,7 +3987,7 @@ static void unixModeBit(unixFile *pFile, unsigned char mask, int *pArg){
 
 /* Forward declaration */
 static int unixGetTempname(int nBuf, char *zBuf);
-#ifndef SQLITE_OMIT_WAL
+#if !defined(SQLITE_WASI) && !defined(SQLITE_OMIT_WAL)
  static int unixFcntlExternalReader(unixFile*, int*);
 #endif
 
@@ -4114,7 +4114,7 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){
 #endif /* SQLITE_ENABLE_LOCKING_STYLE && defined(__APPLE__) */
 
     case SQLITE_FCNTL_EXTERNAL_READER: {
-#ifndef SQLITE_OMIT_WAL
+#if !defined(SQLITE_WASI) && !defined(SQLITE_OMIT_WAL)
       return unixFcntlExternalReader((unixFile*)id, (int*)pArg);
 #else
       *(int*)pArg = 0;
@@ -4287,7 +4287,7 @@ static int unixGetpagesize(void){
 
 #endif /* !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0 */
 
-#ifndef SQLITE_OMIT_WAL
+#if !defined(SQLITE_WASI) && !defined(SQLITE_OMIT_WAL)
 
 /*
 ** Object used to represent an shared memory buffer.