From: drh <drh@noemail.net>
Date: Sat, 10 Jan 2015 18:02:45 +0000 (+0000)
Subject: Make use of the fdatasync() interface if the HAVE_FDATASYNC macro is true.
X-Git-Tag: version-3.8.8~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7a4a1b8c58f511b4dca992f9a314775a1c3aca0;p=thirdparty%2Fsqlite.git

Make use of the fdatasync() interface if the HAVE_FDATASYNC macro is true.

FossilOrigin-Name: 694228e4632c2999efa47ecb49f679c177db02e5
---

diff --git a/manifest b/manifest
index 11f65e9adf..a7573aa5d7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\scompile-time-option\shygiene.\s\sUse\s"#if\sOPTION"\sinstead\sof\n"#ifdef\sOPTION"\sin\scases\swhere\sthat\smakes\ssense,\sso\sthat\s-DOPTION=0\swill\swork.\nAdd\sthe\s"Have-Not"\sconfiguration\sin\sreleasetest.tcl\swhich\sdisables\sall\sof\nthe\s"HAVE_component"\scompile-time\soptions.
-D 2015-01-10T16:49:23.031
+C Make\suse\sof\sthe\sfdatasync()\sinterface\sif\sthe\sHAVE_FDATASYNC\smacro\sis\strue.
+D 2015-01-10T18:02:45.534
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 876093578650b28af50a20c819993ee779885adb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -213,7 +213,7 @@ F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
 F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
-F src/os_unix.c 949cdedc74dbf3c17f2c9743064ce307026f871e
+F src/os_unix.c aefeaf915aaef9f81aa2645e0d5d06fa1bd83beb
 F src/os_win.c 91d3d08e33ec0258d180d4c8255492f47d15e007
 F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
 F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c
@@ -1235,7 +1235,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d6f8c899d8f1bf66a2234e0eb91b259dd64eed31
-R b95d8ce08215c7ec2a42770b5c7b6593
+P 9e92a5ed5aaba20461ed4ce8359d6e34e7773d68
+R 83eb40a0e552094b8653559c8de84718
 U drh
-Z 921820c75b1deafea4774745e8ce3c77
+Z 928cfbe3ecee3b0dfe5377d27df29516
diff --git a/manifest.uuid b/manifest.uuid
index d798d891eb..4fcea9c31a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9e92a5ed5aaba20461ed4ce8359d6e34e7773d68
\ No newline at end of file
+694228e4632c2999efa47ecb49f679c177db02e5
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 3fcb0cff24..ddd6a802eb 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3386,9 +3386,9 @@ int sqlite3_fullsync_count = 0;
 ** We do not trust systems to provide a working fdatasync().  Some do.
 ** Others do no.  To be safe, we will stick with the (slightly slower)
 ** fsync(). If you know that your system does support fdatasync() correctly,
-** then simply compile with -Dfdatasync=fdatasync
+** then simply compile with -Dfdatasync=fdatasync or -DHAVE_FDATASYNC
 */
-#if !defined(fdatasync)
+#if !defined(fdatasync) && !HAVE_FDATASYNC
 # define fdatasync fsync
 #endif