diff --git a/manifest b/manifest index c3f131b513..7c057f18d9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -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 +C Pull\sin\sthe\sposix_fallocate()\schange\sfrom\strunk. +D 2013-06-20T14:17:39.289 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -201,7 +201,7 @@ F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30 F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 -F src/os_unix.c a4c49f855cfd0783d7027a5e20dab6bb10fe4e4b +F src/os_unix.c 9eafa5458cf2ff684ddccff82c9bb113c7cad847 F src/os_win.c 074cb2b9bca6a1c2bd72acf04666cdc554bfaa9b F src/pager.c 79df56da9dd49aceaa4cac207484a9a82cba40ae F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1 @@ -1096,7 +1096,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac -P d97898e8e3990ae8c1882c9102b57692d8810730 2b2ade92788be623af6f57e37d98994be2cec142 -R af29521d8d639d3c1ed2b17d2bc51c2a +P bf5764067ab848e19e5971cbdf892c633495e325 b674462243138fcee192ef05d434665e30c681c4 +R 91cfb3838b57db0708acca963a7bb8c5 U drh -Z 42c7b6eae41e304e98ed87b4d40fa5b5 +Z 767fbda1b22b9d1069574da955ceb02c diff --git a/manifest.uuid b/manifest.uuid index f4251023d7..fc397231db 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bf5764067ab848e19e5971cbdf892c633495e325 \ No newline at end of file +d94db3fd921890ab1d6414ab629410ae50779686 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index e4382cbff9..152bf9a113 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -46,12 +46,6 @@ #include "sqliteInt.h" #if SQLITE_OS_UNIX /* This file is used on unix only */ -/* Use posix_fallocate() if it is available -*/ -#if !defined(HAVE_POSIX_FALLOCATE) && defined(__linux__) -# define HAVE_POSIX_FALLOCATE 1 -#endif - /* ** There are various methods for file locking used for concurrency ** control: