From: drh Date: Wed, 19 Jun 2013 14:28:34 +0000 (+0000) Subject: Only enable posix_fallocate by default on linux and mac. X-Git-Tag: version-3.8.0~139 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fb1b3011870ff7b71084ff0a2a96b5f157b0844;p=thirdparty%2Fsqlite.git Only enable posix_fallocate by default on linux and mac. FossilOrigin-Name: b9b30d4f9845d212e2d3206abbf2795099e5d71d --- diff --git a/manifest b/manifest index dbb20a50de..3d40b02bd2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\sSQLITE_FTS3_MAX_EXPR_DEPTH\scompile\stime\soption. -D 2013-06-11T14:22:11.456 +C Only\senable\sposix_fallocate\sby\sdefault\son\slinux\sand\smac. +D 2013-06-19T14:28:34.073 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 4b19844690e2cc044ec55338818efd53d4f2e33e F src/os_win.c 5f018dbd4cec25c5b47e11432b946a7d2ccee60b F src/pager.c 79df56da9dd49aceaa4cac207484a9a82cba40ae F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1 @@ -1093,7 +1093,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac -P 7e3820e5b989426c64af46f6bf862b91366ae954 -R 5f94a46cd24d5603b852ca86ea7eaf5a -U dan -Z 30f6897d1a48f4a9b1a79c1749e033ce +P 24fc9d4438a5615dd20af5419456166df83a72ea +R 298aea423f152d3f9fd68c724c491cd3 +U drh +Z 1d3faaf5004dcac98d19efaebf760ffc diff --git a/manifest.uuid b/manifest.uuid index 87e2685a16..098c1ea845 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -24fc9d4438a5615dd20af5419456166df83a72ea \ No newline at end of file +b9b30d4f9845d212e2d3206abbf2795099e5d71d \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index 242c2a3c3b..bc1b44cb2d 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(__linux__) || defined(__APPLE__) # define HAVE_POSIX_FALLOCATE 1 #endif