1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-01 06:27:03 +03:00

Merge the latest fixes and enhancements from trunk.

FossilOrigin-Name: 007e5c6df60f9743ac6914332f59925e4a7a861c
This commit is contained in:
drh
2016-01-14 14:48:17 +00:00
64 changed files with 3572 additions and 1188 deletions

View File

@ -994,7 +994,7 @@ static int rbuDeltaCreate(
zDelta += lenOut;
putInt(checksum(zOut, lenOut), &zDelta);
*(zDelta++) = ';';
return zDelta - zOrigDelta;
return (int)(zDelta - zOrigDelta);
}
/* Compute the hash table used to locate matching sections in the
@ -1141,7 +1141,7 @@ static int rbuDeltaCreate(
putInt(checksum(zOut, lenOut), &zDelta);
*(zDelta++) = ';';
sqlite3_free(collide);
return zDelta - zOrigDelta;
return (int)(zDelta - zOrigDelta);
}
/*