From: dan Date: Mon, 22 Nov 2010 17:26:07 +0000 (+0000) Subject: Fix a typo in unixCurrentTimeInt64() preventing compilation with NO_GETTOD defined. X-Git-Tag: version-3.7.4~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15eac4e48a605bfbfb6b92431ffc71686722d2c1;p=thirdparty%2Fsqlite.git Fix a typo in unixCurrentTimeInt64() preventing compilation with NO_GETTOD defined. FossilOrigin-Name: 3df3e79b56821201b4f5ecd23f94d485745c48c3 --- diff --git a/manifest b/manifest index eab536af70..ac73ebad1a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Extra\stests\sfor\s"PRAGMA\scheckpoint_fullfsync". -D 2010-11-20T12:01:35 +C Fix\sa\stypo\sin\sunixCurrentTimeInt64()\spreventing\scompilation\swith\sNO_GETTOD\sdefined. +D 2010-11-22T17:26:07 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e7a59672eaeb04408d1fa8501618d7501a3c5e39 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -160,7 +160,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e -F src/os_unix.c de5be4cdbf3d07018059934eaf7e5d8d594a895c +F src/os_unix.c 6bbb2ac121efad111c8955d03d667946c73b1b42 F src/os_win.c 2f90f7bdec714fad51cd31b4ecad3cc1b4bb5aad F src/pager.c a8b36940ca8afcb45224e0017669782b3b2c90a3 F src/pager.h 0ea59db2a33bc6c2c02cae34de33367e1effdf76 @@ -889,7 +889,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 1c4e58e7211522f0e7dfddd3a2b52f1d0c5421e7 -R 4649b295d741e65ee02f98dbf236e8f0 +P e38c81cc18d2ceaa1644aaba64530ba5d1fbf2cf +R d7dd6f7536f2f168157ffbcee03e168e U dan -Z dd0957804bd79388ac36a7f3739f3c85 +Z 238874a9476b4d03764b69cbc465de50 diff --git a/manifest.uuid b/manifest.uuid index 7e383adb37..c846832a9a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e38c81cc18d2ceaa1644aaba64530ba5d1fbf2cf \ No newline at end of file +3df3e79b56821201b4f5ecd23f94d485745c48c3 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index 9e93a9dcb6..4dc18b83a3 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5000,7 +5000,7 @@ static int unixCurrentTimeInt64(sqlite3_vfs *NotUsed, sqlite3_int64 *piNow){ #if defined(NO_GETTOD) time_t t; time(&t); - *piNow = ((sqlite3_int64)i)*1000 + unixEpoch; + *piNow = ((sqlite3_int64)t)*1000 + unixEpoch; #elif OS_VXWORKS struct timespec sNow; clock_gettime(CLOCK_REALTIME, &sNow);