diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-11-07 11:44:02 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-11-07 11:44:02 +0100 |
| commit | f730841db4db3da4dd33a477fcf016139d699722 (patch) | |
| tree | c6f942a2e8a05c3dd3cddf600507b1e07815c177 /src/libutil | |
| parent | 850f73045f7d34c51bfd1cddfd2c4c0c61e15a36 (diff) | |
| parent | 99af822004418b25b6d04eca67949c62e770c16b (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/libutil')
| -rw-r--r-- | src/libutil/util.cc | 2 | ||||
| -rw-r--r-- | src/libutil/xml-writer.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 0902c3783..998037337 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -10,6 +10,7 @@ #include <cstdio> #include <cstdlib> #include <cstring> +#include <climits> #include <iostream> #include <sstream> #include <thread> @@ -17,7 +18,6 @@ #include <fcntl.h> #include <grp.h> -#include <limits.h> #include <pwd.h> #include <sys/ioctl.h> #include <sys/types.h> diff --git a/src/libutil/xml-writer.cc b/src/libutil/xml-writer.cc index e5cc2e9fc..68857e34d 100644 --- a/src/libutil/xml-writer.cc +++ b/src/libutil/xml-writer.cc @@ -1,10 +1,10 @@ -#include <assert.h> +#include <cassert> #include "xml-writer.hh" namespace nix { - + XMLWriter::XMLWriter(bool indent, std::ostream & output) : output(output), indent(indent) |