From 9b1334b7d3a31f80e43e3f467de38c8c645830bb Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 3 Aug 2023 12:41:30 +0000
Subject: Unix builds now assume the presence of nanosleep() in the standard
 library. The -DHAVE_NANOSLEEP=0 compile-time option can be used to build on
 systems (if any still exist) where this is not the case.

FossilOrigin-Name: 779d5dc8797ea246d0397f7e94b1be716b0baa735e8d9f5a6fc4cffd887a7420
---
 src/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 8f21af13e..35851b64e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1665,9 +1665,9 @@ static int sqliteDefaultBusyCallback(
   void *ptr,               /* Database connection */
   int count                /* Number of times table has been busy */
 ){
-#if SQLITE_OS_WIN || HAVE_USLEEP
+#if SQLITE_OS_WIN || !defined(HAVE_NANOSLEEP) || HAVE_NANOSLEEP
   /* This case is for systems that have support for sleeping for fractions of
-  ** a second.  Examples:  All windows systems, unix systems with usleep() */
+  ** a second.  Examples:  All windows systems, unix systems with nanosleep() */
   static const u8 delays[] =
      { 1, 2, 5, 10, 15, 20, 25, 25,  25,  50,  50, 100 };
   static const u8 totals[] =
-- 
cgit v1.2.3


From 86d77fd95da74bf60015f417c38bc3f8ce9e8823 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 3 Aug 2023 13:30:00 +0000
Subject: Fix build problems associated with SQLITE_OMIT_WSD and
 SQLITE_OMIT_TRIGGER.

FossilOrigin-Name: de031a5ec863b11f0216d1a114740c8cf4572adb034a5d35ff1a5c07d81df800
---
 src/main.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 35851b64e..cd0200890 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4160,10 +4160,12 @@ int sqlite3_test_control(int op, ...){
         sqlite3ShowSrcList(0);
         sqlite3ShowWith(0);
         sqlite3ShowUpsert(0);
+#ifndef SQLITE_OMIT_TRIGGER
         sqlite3ShowTriggerStep(0);
         sqlite3ShowTriggerStepList(0);
         sqlite3ShowTrigger(0);
         sqlite3ShowTriggerList(0);
+#endif
 #ifndef SQLITE_OMIT_WINDOWFUNC
         sqlite3ShowWindow(0);
         sqlite3ShowWinFunc(0);
@@ -4470,6 +4472,7 @@ int sqlite3_test_control(int op, ...){
       break;
     }
 
+#if !defined(SQLITE_OMIT_WSD)
     /* sqlite3_test_control(SQLITE_TESTCTRL_USELONGDOUBLE, int X);
     **
     **   X<0     Make no changes to the bUseLongDouble.  Just report value.
@@ -4484,6 +4487,7 @@ int sqlite3_test_control(int op, ...){
       rc = sqlite3Config.bUseLongDouble!=0;
       break;
     }
+#endif
 
 
 #if defined(SQLITE_DEBUG) && !defined(SQLITE_OMIT_WSD)
-- 
cgit v1.2.3