diff options
| author | dan <dan@noemail.net> | 2020-07-13 18:04:27 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2020-07-13 18:04:27 +0000 |
| commit | a7f82d9f47ca75a2f47dc14f8a8deb6730d718d0 (patch) | |
| tree | e2000d1d8b1b14297c1a8790c65dd90c4a20e2b9 /src/date.c | |
| parent | 7465787b97a0a09841e343630a07ba80f1399e4a (diff) | |
| parent | 5b107654e965973e68c88f90a09a3cc53bac9d8b (diff) | |
| download | sqlite-a7f82d9f47ca75a2f47dc14f8a8deb6730d718d0.tar.gz sqlite-a7f82d9f47ca75a2f47dc14f8a8deb6730d718d0.zip | |
Merge latest trunk changes with this branch.
FossilOrigin-Name: 5ee3c27e20d12a126fb773b428bb864102b949a5b26a8d5c523753dcedf4be10
Diffstat (limited to 'src/date.c')
| -rw-r--r-- | src/date.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/date.c b/src/date.c index fff062fb5..9cba27f59 100644 --- a/src/date.c +++ b/src/date.c @@ -515,7 +515,7 @@ static int osLocaltime(time_t *t, struct tm *pTm){ #if !HAVE_LOCALTIME_R && !HAVE_LOCALTIME_S struct tm *pX; #if SQLITE_THREADSAFE>0 - sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER); + sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MAIN); #endif sqlite3_mutex_enter(mutex); pX = localtime(t); @@ -1211,10 +1211,10 @@ static void currentTimeFunc( #if HAVE_GMTIME_R pTm = gmtime_r(&t, &sNow); #else - sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); + sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MAIN)); pTm = gmtime(&t); if( pTm ) memcpy(&sNow, pTm, sizeof(sNow)); - sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); + sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MAIN)); #endif if( pTm ){ strftime(zBuf, 20, zFormat, &sNow); |