Do not use the second parameter to gettimeofday() on unix. Pass it a NULL. (CVS...

FossilOrigin-Name: 96b678818c9a536b77f10b25256facf4bff1ff65

diff --git a/manifest b/manifest
index 2c6b60ee9713bd05b571c399f0c075486d6d46a0..81218bd5d495e024b9c1fcf6bec1523df0e6396a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sunion\sinitializer\sso\sthat\sit\sworks\swith\sthe\sBorland\scompiler.\s(CVS\s3803)
-D 2007-04-02T17:54:57
+C Do\snot\suse\sthe\ssecond\sparameter\sto\sgettimeofday()\son\sunix.\s\sPass\sit\sa\sNULL.\s(CVS\s3804)
+D 2007-04-02T18:06:58
 F Makefile.in 2f2c3bf69faf0ae7b8e8af4f94f1986849034530
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -82,7 +82,7 @@ F src/os_os2.c 2ce97909b926a598823f97338027dbec1dcf4165
 F src/os_os2.h e5f17dd69333632bbc3112881ea407c37d245eb3
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
-F src/os_unix.c ccb003fb9fadc032924d3efb3fa8cc69fd9e176b
+F src/os_unix.c 13c6f73a7b0c2c6c131c97ea26274db101b594cd
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c c9a99524d6b2bdec636264cad1b67553925e3309
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -449,7 +449,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 9e1295428f476dba21c28149c7983f66a9134559
-R b5effd492556f66636d18aa8bdef059b
+P a067f78bf6a45d68ee1337115704cda2041919f4
+R 4daf2cb76d0d3ae06a048157e8b7a4ac
 U drh
-Z 5fefb8398ce1181ab15da3c2a59e2ca2
+Z c304d450e108ab4be1b5924958d5bd52

diff --git a/manifest.uuid b/manifest.uuid
index 13e3b89058617a1556d534df194ca2bf75de69e8..d41a9e4c8754d4a272a8eb7881f758694baf7034 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a067f78bf6a45d68ee1337115704cda2041919f4
\ No newline at end of file
+96b678818c9a536b77f10b25256facf4bff1ff65
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 2fff26852d480d3d2a67841905128351473169e1..18ae4b76c046ed5e6a7523eebfdae7b2e835b5bc 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2909,8 +2909,7 @@ int sqlite3UnixCurrentTime(double *prNow){
   *prNow = t/86400.0 + 2440587.5;
 #else
   struct timeval sNow;
-  struct timezone sTz;  /* Not used */
-  gettimeofday(&sNow, &sTz);
+  gettimeofday(&sNow, 0);
   *prNow = 2440587.5 + sNow.tv_sec/86400.0 + sNow.tv_usec/86400000000.0;
 #endif
 #ifdef SQLITE_TEST