Bugfix: Define and use HAVE_FDATASYNC correctly outside LevelDB

luke-jr · luke-jr · commit c4b85ba704a1 · 2020-08-25T16:46:00.000Z
diff --git a/configure.ac b/configure.ac
@@ -1039,13 +1039,13 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>
  [ AC_MSG_RESULT(no)]
 )
 
-dnl LevelDB platform checks
 AC_MSG_CHECKING(for fdatasync)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]],
  [[ fdatasync(0); ]])],
  [ AC_MSG_RESULT(yes); HAVE_FDATASYNC=1 ],
  [ AC_MSG_RESULT(no); HAVE_FDATASYNC=0 ]
 )
+AC_DEFINE_UNQUOTED([HAVE_FDATASYNC], [$HAVE_FDATASYNC], [Define to 1 if fdatasync is available.])
 
 AC_MSG_CHECKING(for F_FULLFSYNC)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <fcntl.h>]],
diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -1025,7 +1025,7 @@ bool FileCommit(FILE *file)
         return false;
     }
 #else
-    #if defined(HAVE_FDATASYNC)
+    #if HAVE_FDATASYNC
     if (fdatasync(fileno(file)) != 0 && errno != EINVAL) { // Ignore EINVAL for filesystems that don't support sync
         LogPrintf("%s: fdatasync failed: %d\n", __func__, errno);
         return false;

Original file line number	Diff line number	Diff line change
`@@ -1039,13 +1039,13 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>`
`1039`	`1039`	`[ AC_MSG_RESULT(no)]`
`1040`	`1040`	`)`
`1041`	`1041`
`1042`		`-dnl LevelDB platform checks`
`1043`	`1042`	`AC_MSG_CHECKING(for fdatasync)`
`1044`	`1043`	`AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]],`
`1045`	`1044`	`[[ fdatasync(0); ]])],`
`1046`	`1045`	`[ AC_MSG_RESULT(yes); HAVE_FDATASYNC=1 ],`
`1047`	`1046`	`[ AC_MSG_RESULT(no); HAVE_FDATASYNC=0 ]`
`1048`	`1047`	`)`
	`1048`	`+AC_DEFINE_UNQUOTED([HAVE_FDATASYNC], [$HAVE_FDATASYNC], [Define to 1 if fdatasync is available.])`
`1049`	`1049`
`1050`	`1050`	`AC_MSG_CHECKING(for F_FULLFSYNC)`
`1051`	`1051`	`AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <fcntl.h>]],`
Original file line number	Diff line number	Diff line change
`@@ -1025,7 +1025,7 @@ bool FileCommit(FILE *file)`
`1025`	`1025`	`return false;`
`1026`	`1026`	`}`
`1027`	`1027`	`#else`
`1028`		`- #if defined(HAVE_FDATASYNC)`
	`1028`	`+ #if HAVE_FDATASYNC`
`1029`	`1029`	`if (fdatasync(fileno(file)) != 0 && errno != EINVAL) { // Ignore EINVAL for filesystems that don't support sync`
`1030`	`1030`	`LogPrintf("%s: fdatasync failed: %d\n", __func__, errno);`
`1031`	`1031`	`return false;`