From: drh Date: Wed, 19 Jun 2013 23:48:35 +0000 (+0000) Subject: Merge in trunk changes to os_unix.c that allow the code to build on X-Git-Tag: version-3.8.0~134^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48779e590cdbe8799ab099ec4a4cefb7009e243c;p=thirdparty%2Fsqlite.git Merge in trunk changes to os_unix.c that allow the code to build on unix platforms that lack posix_fallocate(). FossilOrigin-Name: bf5764067ab848e19e5971cbdf892c633495e325 --- 48779e590cdbe8799ab099ec4a4cefb7009e243c diff --cc manifest index b27c436553,aab16234de..c3f131b513 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Add\sin\sthe\scost\sof\sdoing\sa\stable\slookup\son\sOR\ssearches.\s\sMake\stest\scase\nchanges\sto\sdeal\swith\sdifference\sin\sSTAT3\sbehavior. - D 2013-06-19T18:01:44.089 -C Only\sdefault\sHAVE_POSIX_FALLOCATE\son\sfor\slinux,\sand\sthen\sonly\sif\sit\sis\snot\npreviously\sdefined. -D 2013-06-19T14:49:14.627 ++C Merge\sin\strunk\schanges\sto\sos_unix.c\sthat\sallow\sthe\scode\sto\sbuild\son\nunix\splatforms\sthat\slack\sposix_fallocate(). ++D 2013-06-19T23:48:35.353 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@@ -201,8 -201,8 +201,8 @@@ F src/notify.c 976dd0f6171d4588e89e874f F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 - F src/os_unix.c 42c9b8b7c61c9fa3561258f523be5749e52ed0e0 + F src/os_unix.c a4c49f855cfd0783d7027a5e20dab6bb10fe4e4b -F src/os_win.c 5f018dbd4cec25c5b47e11432b946a7d2ccee60b +F src/os_win.c 074cb2b9bca6a1c2bd72acf04666cdc554bfaa9b F src/pager.c 79df56da9dd49aceaa4cac207484a9a82cba40ae F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1 F src/parse.y 9acfcc83ddbf0cf82f0ed9582ccf0ad6c366ff37 @@@ -1094,9 -1092,8 +1094,9 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9 F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 +F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac - P 8d2ae8e2f343f82f6fba6d0e89cee7f15b444aa3 - R f44808387531e19eca9d858ab5ea40e0 -P b9b30d4f9845d212e2d3206abbf2795099e5d71d -R 051331ae49dcb9481117487fe2ddd3f7 ++P d97898e8e3990ae8c1882c9102b57692d8810730 2b2ade92788be623af6f57e37d98994be2cec142 ++R af29521d8d639d3c1ed2b17d2bc51c2a U drh - Z 1152d5230daa64158b83c69b1e514ae0 -Z f091211d6e3ac84847a4aa6c11062c5e ++Z 42c7b6eae41e304e98ed87b4d40fa5b5 diff --cc manifest.uuid index 6cc8090fec,edfc6bc72c..f4251023d7 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - d97898e8e3990ae8c1882c9102b57692d8810730 -2b2ade92788be623af6f57e37d98994be2cec142 ++bf5764067ab848e19e5971cbdf892c633495e325