diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-02-24 15:46:06 +0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-02-24 15:46:06 +0000 |
commit | 84a4dd5ff08ceb7894d8dce662265d7d188e615c (patch) | |
tree | 8a87f32a5cf2ae54d0e8dc448efa4b8536e21482 /src/libutil | |
parent | 7db2831d3a76bc239bb7a9f7573152ce12413c29 (diff) |
* Don't use fdatasync since it doesn't work on Snow Leopard.
* Don't refer to config.h in util.hh, because config.h is not
installed (http://hydra.nixos.org/build/303053).
Diffstat (limited to 'src/libutil')
-rw-r--r-- | src/libutil/util.cc | 2 | ||||
-rw-r--r-- | src/libutil/util.hh | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 8c52625a2..eec60867d 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -233,7 +233,7 @@ void writeFile(const Path & path, const string & s, bool doFsync) if (fd == -1) throw SysError(format("opening file `%1%'") % path); writeFull(fd, (unsigned char *) s.c_str(), s.size()); - if (doFsync) fdatasync(fd); + if (doFsync) fsync(fd); } diff --git a/src/libutil/util.hh b/src/libutil/util.hh index 90132da73..f609e8944 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -1,8 +1,6 @@ #ifndef __UTIL_H #define __UTIL_H -#include "config.h" - #include "types.hh" #include <sys/types.h> @@ -12,10 +10,6 @@ #include <cstdio> -#ifndef HAVE_FDATASYNC -#define fdatasync fsync -#endif - namespace nix { |