diff options
| author | dan <Dan Kennedy> | 2023-08-10 17:07:34 +0000 |
|---|---|---|
| committer | dan <Dan Kennedy> | 2023-08-10 17:07:34 +0000 |
| commit | 6de6121e36e33d214c5f19e9197f7cee0fb60d7f (patch) | |
| tree | 165e77da459e2813194b6b46c96be7d2e47f62c3 /src/main.c | |
| parent | 9a897cb0dea3fe2aa17e2b1d1155fe016447fa76 (diff) | |
| parent | 80c438613a687d41ce820f113a2b20e1aade93a6 (diff) | |
| download | sqlite-6de6121e36e33d214c5f19e9197f7cee0fb60d7f.tar.gz sqlite-6de6121e36e33d214c5f19e9197f7cee0fb60d7f.zip | |
Merge latest trunk changes into this branch.
FossilOrigin-Name: 3ed89c344fcb3b7ee8b764d95144643e42e053e1116150d6eda8355fbd6669df
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c index 8f21af13e..cd0200890 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[] = @@ -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) |