Only default HAVE_POSIX_FALLOCATE on for linux, and then only if it is not

previously defined.

FossilOrigin-Name: 2b2ade92788be623af6f57e37d98994be2cec142

diff --git a/manifest b/manifest
index 3d40b02bd27bf631827d099ed770a50fdff603ce..aab16234deeed2a00b660c7725bd28d78643f29c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Only\senable\sposix_fallocate\sby\sdefault\son\slinux\sand\smac.
-D 2013-06-19T14:28:34.073
+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
 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 4b19844690e2cc044ec55338818efd53d4f2e33e
+F src/os_unix.c a4c49f855cfd0783d7027a5e20dab6bb10fe4e4b
 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 24fc9d4438a5615dd20af5419456166df83a72ea
-R 298aea423f152d3f9fd68c724c491cd3
+P b9b30d4f9845d212e2d3206abbf2795099e5d71d
+R 051331ae49dcb9481117487fe2ddd3f7
 U drh
-Z 1d3faaf5004dcac98d19efaebf760ffc
+Z f091211d6e3ac84847a4aa6c11062c5e

diff --git a/manifest.uuid b/manifest.uuid
index 098c1ea8454807e1ad75d61a09e412c63a169b76..edfc6bc72cf0c98208a951bf3128968554c0cf78 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b9b30d4f9845d212e2d3206abbf2795099e5d71d
\ No newline at end of file
+2b2ade92788be623af6f57e37d98994be2cec142
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index bc1b44cb2d451f1e381f1e90eb585215eb57e7ec..e4382cbff988c0dc70b32558261214ac73820150 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -48,7 +48,7 @@
 
 /* Use posix_fallocate() if it is available
 */
-#if defined(__linux__) || defined(__APPLE__)
+#if !defined(HAVE_POSIX_FALLOCATE) && defined(__linux__)
 # define HAVE_POSIX_FALLOCATE 1
 #endif