lix-project/lix
20
57
Fork 31
Code Issues 348 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Don't use fdatasync since it doesn't work on Snow Leopard.

Browse source 
* Don't refer to config.h in util.hh, because config.h is not
  installed (http://hydra.nixos.org/build/303053).
This commit is contained in:
Eelco Dolstra 2010-02-24 15:46:06 +00:00
parent 7db2831d3a
commit 84a4dd5ff0
4 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -262,7 +262,6 @@ AC_CHECK_FUNCS([setresuid setreuid lchown])
# Nice to have, but not essential. # Nice to have, but not essential.
AC_CHECK_FUNCS([strsignal]) AC_CHECK_FUNCS([strsignal])
AC_CHECK_FUNCS([posix_fallocate]) AC_CHECK_FUNCS([posix_fallocate])
AC_CHECK_FUNCS([fdatasync])
# This is needed if ATerm or bzip2 are static libraries, # This is needed if ATerm or bzip2 are static libraries,

4
src/libstore/local-store.cc
View file

@ -240,7 +240,7 @@ void LocalStore::appendReferrer(const Path & from, const Path & to, bool lock)
string s = " " + to; string s = " " + to;
writeFull(fd, (const unsigned char *) s.c_str(), s.size()); writeFull(fd, (const unsigned char *) s.c_str(), s.size());
if (doFsync) fdatasync(fd); if (doFsync) fsync(fd);
} }
@ -271,7 +271,7 @@ void LocalStore::rewriteReferrers(const Path & path, bool purge, PathSet referre
writeFull(fd, (const unsigned char *) s.c_str(), s.size()); writeFull(fd, (const unsigned char *) s.c_str(), s.size());
if (doFsync) fdatasync(fd); if (doFsync) fsync(fd);
fd.close(); /* for Windows; can't rename open file */ fd.close(); /* for Windows; can't rename open file */

2
src/libutil/util.cc
View file

@ -233,7 +233,7 @@ void writeFile(const Path & path, const string & s, bool doFsync)
if (fd == -1) if (fd == -1)
throw SysError(format("opening file `%1%'") % path); throw SysError(format("opening file `%1%'") % path);
writeFull(fd, (unsigned char *) s.c_str(), s.size()); writeFull(fd, (unsigned char *) s.c_str(), s.size());
if (doFsync) fdatasync(fd); if (doFsync) fsync(fd);
} }

6
src/libutil/util.hh
View file

@ -1,8 +1,6 @@
#ifndef __UTIL_H #ifndef __UTIL_H
#define __UTIL_H #define __UTIL_H
#include "config.h"
#include "types.hh" #include "types.hh"
#include <sys/types.h> #include <sys/types.h>
@ -12,10 +10,6 @@
#include <cstdio> #include <cstdio>
#ifndef HAVE_FDATASYNC
#define fdatasync fsync
#endif
namespace nix { namespace nix {