summaryrefslogtreecommitdiff
path: root/src/systemd/src/basic/fd-util.c
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-01-04 15:22:51 +0100
committerThomas Haller <thaller@redhat.com>2016-01-04 17:03:11 +0100
commitac7a6d02061fb73e077a44f6440e696508302364 (patch)
treef6082fcacdac5ffbcf8ab8a1ebc81708966fb960 /src/systemd/src/basic/fd-util.c
parent4b5352057aebd9f1dc4e3a44a3258f6ce55f0266 (diff)
parent606ad7e62bbd97da354b2100be307d52ee920aca (diff)
downloadNetworkManager-ac7a6d02061fb73e077a44f6440e696508302364.tar.gz
systemd: merge branch 'systemd' into master
Diffstat (limited to 'src/systemd/src/basic/fd-util.c')
-rw-r--r--src/systemd/src/basic/fd-util.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/systemd/src/basic/fd-util.c b/src/systemd/src/basic/fd-util.c
index c26f4d6f98..3828148ca7 100644
--- a/src/systemd/src/basic/fd-util.c
+++ b/src/systemd/src/basic/fd-util.c
@@ -21,13 +21,20 @@
#include "nm-sd-adapt.h"
-#if 0 /* NM_IGNORED */
-#include "dirent-util.h"
-#endif /* NM_IGNORED */
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/resource.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
#include "fd-util.h"
+#include "macro.h"
#if 0 /* NM_IGNORED */
-#include "parse-util.h"
+#include "missing.h"
#endif /* NM_IGNORED */
+#include "parse-util.h"
+#include "path-util.h"
#include "socket-util.h"
#include "util.h"