From: mistachkin <mistachkin@noemail.net>
Date: Wed, 15 Feb 2017 00:02:02 +0000 (+0000)
Subject: Compilation fix for POSIX.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3161bc5cb6e06dee805e9621f55743318978eb08;p=thirdparty%2Fsqlite.git

Compilation fix for POSIX.

FossilOrigin-Name: 9964ad245f66cd04cb41338180b65923ef093094
---

diff --git a/manifest b/manifest
index 23aff9da97..8e9c0784db 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Experimental\senhancements\sto\smutex\sdebugging.
-D 2017-02-14T23:58:30.321
+C Compilation\sfix\sfor\sPOSIX.
+D 2017-02-15T00:02:02.950
 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 067a6766f800cc8d72845ab61f8de4ffe8f3fc99
@@ -399,7 +399,7 @@ F src/shell.c a661e7ccd202b16cb5321999354699e5ee018fb2
 F src/sqlite.h.in 751ff125eb159c8f92c182b8df980a5e4f50e966
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
-F src/sqliteInt.h b8c2e9ea279edf9b544fa29cc1cea60e9f8f2145
+F src/sqliteInt.h 62ec0dc535758f5624d19da6ef734cb4cd24cb01
 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
 F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1555,10 +1555,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 ca4f1e4962df64ae756c286f3795af7d6f692cdd
-R d6a0bafe616fe547ff07dfc42e463ec9
-T *branch * mutexDbg2
-T *sym-mutexDbg2 *
-T -sym-trunk *
+P 804817549cfecbe5e1c4cea605d54cb4164f9bb6
+R 4773f670afc6566c386c1e0d5763b2af
 U mistachkin
-Z 92255d0c1926221a5bf48dc4677aec44
+Z 33ca2f157e3872dfd70ee3a818230e82
diff --git a/manifest.uuid b/manifest.uuid
index b8032df192..1b8e9ea861 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-804817549cfecbe5e1c4cea605d54cb4164f9bb6
\ No newline at end of file
+9964ad245f66cd04cb41338180b65923ef093094
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 128ae970fd..ce68f5fae7 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3546,7 +3546,7 @@ const sqlite3_mem_methods *sqlite3MemGetMemsys3(void);
 */
 # ifndef SQLITE_GET_MUTEX_TIME
 #  if SQLITE_OS_UNIX
-#   define SQLITE_GET_MUTEX_TIME()   (((i64)time())*1000)
+#   define SQLITE_GET_MUTEX_TIME()   (((i64)time(0))*1000)
 #  elif SQLITE_OS_WIN
 #   define SQLITE_GET_MUTEX_TIME()   ((i64)GetTickCount())
 #  else