mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move variable declaration in zipfile extension to fix MSVC compiler error.

Browse Source 
FossilOrigin-Name: ac6a32482e675871c3ce5ecc727e50e4bba649e80e3c55bf99025fed5667da94
This commit is contained in:
mistachkin 2018-02-04 01:29:01 +00:00
parent 3944cf8de3
commit 001f52ed7d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/misc/zipfile.c
View File

@ -701,6 +701,7 @@ static u32 zipfileMtime(ZipfileCDS *pCDS){
int sec = (pCDS->mTime & 0x1F)*2; int sec = (pCDS->mTime & 0x1F)*2;
int min = (pCDS->mTime >> 5) & 0x3F; int min = (pCDS->mTime >> 5) & 0x3F;
int hr = (pCDS->mTime >> 11) & 0x1F; int hr = (pCDS->mTime >> 11) & 0x1F;
i64 JD;
/* JD = INT(365.25 * (Y+4716)) + INT(30.6001 * (M+1)) + D + B - 1524.5 */ /* JD = INT(365.25 * (Y+4716)) + INT(30.6001 * (M+1)) + D + B - 1524.5 */
@ -709,7 +710,7 @@ static u32 zipfileMtime(ZipfileCDS *pCDS){
Y = Y-1; Y = Y-1;
M = M+12; M = M+12;
} }
i64 JD = (i64)(24*60*60) * ( JD = (i64)(24*60*60) * (
(int)(365.25 * (Y + 4716)) (int)(365.25 * (Y + 4716))
+ (int)(30.6001 * (M + 1)) + (int)(30.6001 * (M + 1))
+ D + B - 1524 + D + B - 1524

15
manifest
View File

@ -1,5 +1,5 @@
C Remove\sthe\s"include\s<io.h>"\swin32\sdependency\sfrom\sthe\szipfile\sextension. C Move\svariable\sdeclaration\sin\szipfile\sextension\sto\sfix\sMSVC\scompiler\serror.
D 2018-02-02T16:28:19.035 D 2018-02-04T01:29:01.007
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F Makefile.in 7a3f714b4fcf793108042b7b0a5c720b0b310ec84314d61ba7f3f49f27e550ea F Makefile.in 7a3f714b4fcf793108042b7b0a5c720b0b310ec84314d61ba7f3f49f27e550ea
@ -304,7 +304,7 @@ F ext/misc/vfsstat.c bf10ef0bc51e1ad6756629e1edb142f7a8db1178
F ext/misc/vtablog.c 31d0d8f4406795679dcd3a67917c213d3a2a5fb3ea5de35f6e773491ed7e13c9 F ext/misc/vtablog.c 31d0d8f4406795679dcd3a67917c213d3a2a5fb3ea5de35f6e773491ed7e13c9
F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd
F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212 F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
F ext/misc/zipfile.c 8aa0d3da5ccb360dbca578a95597bd4892ccc56b63f01447dcbb0e035720fb9f F ext/misc/zipfile.c 3c3e21d0351a44c34c67ca7e833ba04e0de34421b4c9359aa764919ee36b37ef
F ext/rbu/rbu.c ea7d1b7eb44c123a2a619332e19fe5313500705c4a58aaa1887905c0d83ffc2e F ext/rbu/rbu.c ea7d1b7eb44c123a2a619332e19fe5313500705c4a58aaa1887905c0d83ffc2e
F ext/rbu/rbu1.test 43836fac8c7179a358eaf38a8a1ef3d6e6285842 F ext/rbu/rbu1.test 43836fac8c7179a358eaf38a8a1ef3d6e6285842
F ext/rbu/rbu10.test 1846519a438697f45e9dcb246908af81b551c29e1078d0304fae83f1fed7e9ee F ext/rbu/rbu10.test 1846519a438697f45e9dcb246908af81b551c29e1078d0304fae83f1fed7e9ee
@ -1704,8 +1704,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 0702fb5611c7cf0154c5490eeada66afc733731dff0fe030375bae6a72123a17 P cb3feb3bc33718625159eddbf8ef608cd641af84e97d433d6b11ba6da94dad2e
R 343c0b60986622084d28e8dfa8a41cbf R 8b8d4f678534b218d44a7c7eccfb3100
T +closed db32506880e727597e8629c21d29a4b5e3360bec7548d98ecdbb09685fd6e7a8 U mistachkin
U dan Z e519063d0405ad8f0532efc454c9e10a
Z 0fa1b90106adf879fb72d19e962c14d7

2
manifest.uuid
View File

@ -1 +1 @@
cb3feb3bc33718625159eddbf8ef608cd641af84e97d433d6b11ba6da94dad2e ac6a32482e675871c3ce5ecc727e50e4bba649e80e3c55bf99025fed5667da94