1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 08:31:16 +02:00

Merge pull request #685 from vizanto/master

POSIX compliant directory access (fixes build on Solaris)
This commit is contained in:
Eelco Dolstra 2016-01-05 13:49:55 +01:00
commit 6298afc047
3 changed files with 8 additions and 1 deletions

View file

@ -232,7 +232,7 @@ DirEntries readDirectory(const Path & path)
checkInterrupt();
string name = dirent->d_name;
if (name == "." || name == "..") continue;
entries.emplace_back(name, dirent->d_ino, dirent->d_type);
entries.emplace_back(name, dirent->d_ino, #ifdef HAVE_STRUCT_DIRENT_D_TYPE dirent->d_type #else DT_UNKNOWN #endif);
}
if (errno) throw SysError(format("reading directory %1%") % path);