aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-12-14 01:51:14 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-12-14 01:51:14 +0100
commit4e0607369e86f0a8e2d55df831567a410ffd3328 (patch)
treed747cb1aa0bb58f1ceebc9fa747f64a4a1ad8c4d
parent8bdff8c1003501bab0dbc63ed6c391ff2f2da4b5 (diff)
Pedantry
-rw-r--r--src/download-via-ssh/download-via-ssh.cc2
-rw-r--r--src/libexpr/parser.y4
-rw-r--r--src/libmain/shared.cc2
-rw-r--r--src/libstore/optimise-store.cc2
-rw-r--r--src/libutil/monitor-fd.hh2
5 files changed, 4 insertions, 8 deletions
diff --git a/src/download-via-ssh/download-via-ssh.cc b/src/download-via-ssh/download-via-ssh.cc
index 164c24b49..f71cf5650 100644
--- a/src/download-via-ssh/download-via-ssh.cc
+++ b/src/download-via-ssh/download-via-ssh.cc
@@ -9,7 +9,7 @@
#include "store-api.hh"
#include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
#include <unistd.h>
using namespace nix;
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index dcb270b86..ff174815e 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -53,10 +53,6 @@ namespace nix {
#include "parser-tab.hh"
#include "lexer-tab.hh"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
YY_DECL;
using namespace nix;
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index 9c74a614e..082705d9e 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -11,7 +11,7 @@
#include <exception>
#include <algorithm>
-#include <stdlib.h>
+#include <cstdlib>
#include <sys/time.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc
index fb5607676..55c252b9b 100644
--- a/src/libstore/optimise-store.cc
+++ b/src/libstore/optimise-store.cc
@@ -4,7 +4,7 @@
#include "local-store.hh"
#include "globals.hh"
-#include <stdlib.h>
+#include <cstdlib>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/src/libutil/monitor-fd.hh b/src/libutil/monitor-fd.hh
index e99869eff..6f01ccd91 100644
--- a/src/libutil/monitor-fd.hh
+++ b/src/libutil/monitor-fd.hh
@@ -3,7 +3,7 @@
#include <thread>
#include <atomic>
-#include <stdlib.h>
+#include <cstdlib>
#include <poll.h>
#include <sys/types.h>
#include <unistd.h>