From: dan <Dan Kennedy>
Date: Tue, 2 Nov 2021 11:09:24 +0000 (+0000)
Subject: Add #ifdef logic to os_unix.c so that it builds with SQLITE_OMIT_WAL defined.
X-Git-Tag: version-3.37.0~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a12a40c3f00c40c3da412beff15828ff2d2e0aef;p=thirdparty%2Fsqlite.git

Add #ifdef logic to os_unix.c so that it builds with SQLITE_OMIT_WAL defined.

FossilOrigin-Name: 948c2cb2a2f44ba069cfbf5e9a57e56964f3a40db57459bb439bea9c3bd9f211
---

diff --git a/manifest b/manifest
index 0e2c3721e1..a0e0e79f62 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\srecent\sdbsqlfuzz\scases\sto\stest/fuzzdata8.db.
-D 2021-11-02T10:47:20.363
+C Add\s#ifdef\slogic\sto\sos_unix.c\sso\sthat\sit\sbuilds\swith\sSQLITE_OMIT_WAL\sdefined.
+D 2021-11-02T11:09:24.625
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -533,7 +533,7 @@ F src/os.c b1c4f2d485961e9a5b6b648c36687d25047c252222e9660b7cc25a6e1ea436ab
 F src/os.h 26890f540b475598cd9881dcc68931377b8d429d3ea3e2eeb64470cde64199f8
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
-F src/os_unix.c f445ad0597184e27f225bfc3d327dee32b49f7918d6eda9c921369b5060d96ef
+F src/os_unix.c 8e14b40fd02f70e234030c2bee45215ff8835293adc13a08e9718c29bff61401
 F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c bc10c191d18bffd3d76eda5f162799e43a9f875ecfe7c4869f752e2ddef87ea2
@@ -1930,7 +1930,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0a5b94b99cf45df759a59cb5fc62da111ca33f8c2614769a81930d72b51f093a
-R 62fd224b940dabced520e214f563bdab
-U drh
-Z ba8f00524c3aa0304d043d5aeeb07d3d
+P 8c3f2536d2853acef05c4e8c07f301abb0687402c56ded5ff8614e79fb049423
+R 8b376094a1e25df4570f2864eb07a1ac
+U dan
+Z 94bd6fda7f782c0744099483ca9f3618
diff --git a/manifest.uuid b/manifest.uuid
index c54b920fb3..c18f0de842 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8c3f2536d2853acef05c4e8c07f301abb0687402c56ded5ff8614e79fb049423
\ No newline at end of file
+948c2cb2a2f44ba069cfbf5e9a57e56964f3a40db57459bb439bea9c3bd9f211
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index bc6063dae8..0e184af3c1 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3951,7 +3951,9 @@ static void unixModeBit(unixFile *pFile, unsigned char mask, int *pArg){
 
 /* Forward declaration */
 static int unixGetTempname(int nBuf, char *zBuf);
-static int unixFcntlExternalReader(unixFile*, int*);
+#ifndef SQLITE_OMIT_WAL
+ static int unixFcntlExternalReader(unixFile*, int*);
+#endif
 
 /*
 ** Information and control of an open file handle.
@@ -4070,7 +4072,12 @@ 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
       return unixFcntlExternalReader((unixFile*)id, (int*)pArg);
+#else
+      *(int*)pArg = 0;
+      return SQLITE_OK;
+#endif
     }
   }
   return SQLITE_NOTFOUND;