diff options
| author | Danny Wilson <danny@prime.vc> | 2015-11-07 04:51:33 +0100 |
|---|---|---|
| committer | Danny Wilson <danny@prime.vc> | 2015-11-07 04:51:33 +0100 |
| commit | cdb346c65eeb9f976cf3db21b3cb2f7d8837cf6b (patch) | |
| tree | 386245c3d4acca4bbc88c805a1db25953c9eba2a | |
| parent | 5bc12454fd0ca07c26de197daaf0b52188d517b5 (diff) | |
Fix build on Solaris
d_type is not part of the POSIX spec unfortunately.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/libutil/util.cc | 4 | ||||
| -rw-r--r-- | src/libutil/util.hh | 6 |
3 files changed, 11 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 88e64573d..bade079b3 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,7 @@ test "$localstatedir" = '${prefix}/var' && localstatedir=/nix/var # Solaris-specific stuff. +AC_STRUCT_DIRENT_D_TYPE if test "$sys_name" = sunos; then # Solaris requires -lsocket -lnsl for network functions LIBS="-lsocket -lnsl $LIBS" diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 27116fd18..d1b67c6d4 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -232,7 +232,11 @@ DirEntries readDirectory(const Path & path) checkInterrupt(); string name = dirent->d_name; if (name == "." || name == "..") continue; +#ifdef HAVE_STRUCT_DIRENT_D_TYPE entries.emplace_back(name, dirent->d_ino, dirent->d_type); +#else + entries.emplace_back(name, dirent->d_ino, getFileType(absPath(name, path))); +#endif } if (errno) throw SysError(format("reading directory ‘%1%’") % path); diff --git a/src/libutil/util.hh b/src/libutil/util.hh index 038838820..2edc5344f 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -11,6 +11,12 @@ #include <cstdio> +#ifndef HAVE_STRUCT_DIRENT_D_TYPE +#define DT_UNKNOWN 0 +#define DT_REG 1 +#define DT_LNK 2 +#define DT_DIR 3 +#endif namespace nix { |