diff options
| author | mistachkin <mistachkin@noemail.net> | 2015-01-12 18:52:57 +0000 |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2015-01-12 18:52:57 +0000 |
| commit | 9b97b8fed970afe1edcae8b49281c072b92c93d0 (patch) | |
| tree | 5e933832179cd56eb86c79d942f73df4d9c36dcc /src/main.c | |
| parent | 7bb6e8e16962d2201a5d61d5e02a52b4d453786c (diff) | |
| parent | 8d9da63dacde128e546f84cb34392188aab1be83 (diff) | |
| download | sqlite-9b97b8fed970afe1edcae8b49281c072b92c93d0.tar.gz sqlite-9b97b8fed970afe1edcae8b49281c072b92c93d0.zip | |
Merge updates from trunk.
FossilOrigin-Name: ca5f2c545216c82486e66d26f55b49cbf351ffdc
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index 625d76899..8cf16b001 100644 --- a/src/main.c +++ b/src/main.c @@ -1350,7 +1350,7 @@ static int sqliteDefaultBusyCallback( void *ptr, /* Database connection */ int count /* Number of times table has been busy */ ){ -#if SQLITE_OS_WIN || (defined(HAVE_USLEEP) && HAVE_USLEEP) +#if SQLITE_OS_WIN || HAVE_USLEEP static const u8 delays[] = { 1, 2, 5, 10, 15, 20, 25, 25, 25, 50, 50, 100 }; static const u8 totals[] = |