diff --git a/manifest b/manifest index b27c436553..c3f131b513 100644 --- a/manifest +++ b/manifest @@ -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 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,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 42c9b8b7c61c9fa3561258f523be5749e52ed0e0 +F src/os_unix.c a4c49f855cfd0783d7027a5e20dab6bb10fe4e4b 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 8d2ae8e2f343f82f6fba6d0e89cee7f15b444aa3 -R f44808387531e19eca9d858ab5ea40e0 +P d97898e8e3990ae8c1882c9102b57692d8810730 2b2ade92788be623af6f57e37d98994be2cec142 +R af29521d8d639d3c1ed2b17d2bc51c2a U drh -Z 1152d5230daa64158b83c69b1e514ae0 +Z 42c7b6eae41e304e98ed87b4d40fa5b5 diff --git a/manifest.uuid b/manifest.uuid index 6cc8090fec..f4251023d7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d97898e8e3990ae8c1882c9102b57692d8810730 \ No newline at end of file +bf5764067ab848e19e5971cbdf892c633495e325 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index 242c2a3c3b..e4382cbff9 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -48,8 +48,7 @@ /* Use posix_fallocate() if it is available */ -#if !defined(HAVE_POSIX_FALLOCATE) \ - && (_XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L) +#if !defined(HAVE_POSIX_FALLOCATE) && defined(__linux__) # define HAVE_POSIX_FALLOCATE 1 #endif