diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-11-15 20:11:35 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-11-15 20:11:35 +0100 |
| commit | f056553c6b8ffa36f4ce9fb1c3602a8f4b1de242 (patch) | |
| tree | 80c815216a3717cf00b615c9cb8840c113eaf79f /nix/libstore/local-store.cc | |
| parent | 2c9d34166983565120f831284df57a07e2edd2f9 (diff) | |
| parent | 528b52390d216d8a8cd13dfcd1e6e40a6448e6c2 (diff) | |
| download | guix-patches-f056553c6b8ffa36f4ce9fb1c3602a8f4b1de242.tar guix-patches-f056553c6b8ffa36f4ce9fb1c3602a8f4b1de242.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'nix/libstore/local-store.cc')
| -rw-r--r-- | nix/libstore/local-store.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc index 3793382361..7a520925e5 100644 --- a/nix/libstore/local-store.cc +++ b/nix/libstore/local-store.cc @@ -28,11 +28,8 @@ #include <sys/mount.h> #endif -#if HAVE_LINUX_FS_H -#include <linux/fs.h> #include <sys/ioctl.h> #include <errno.h> -#endif #include <sqlite3.h> |