summaryrefslogtreecommitdiff
path: root/src/systemd-nspawn
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-07-27 21:09:48 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-07-27 21:09:48 -0400
commite2582041327daab7590c369e99988ab4c827a77b (patch)
tree6946476c40adf51bc7a9f84071a3373a89af25a0 /src/systemd-nspawn
parentea373df773e0e8184a4b3f8ffff3bb43f307cde9 (diff)
fix (mostly adjust #includes to have sd- prefix)
Diffstat (limited to 'src/systemd-nspawn')
-rw-r--r--src/systemd-nspawn/Makefile1
-rw-r--r--src/systemd-nspawn/nspawn-expose-ports.c2
-rw-r--r--src/systemd-nspawn/nspawn-register.c2
3 files changed, 2 insertions, 3 deletions
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index 5d6fcfdc5a..8ea5967add 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -82,7 +82,6 @@ test_patch_uid_LDADD = \
manual_tests += \
test-patch-uid
-systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c
index 71eb88873c..56afe930ac 100644
--- a/src/systemd-nspawn/nspawn-expose-ports.c
+++ b/src/systemd-nspawn/nspawn-expose-ports.c
@@ -23,7 +23,7 @@
#include "fd-util.h"
#include "firewall-util.h"
#include "in-addr-util.h"
-#include "local-addresses.h"
+#include "sd-netlink/local-addresses.h"
#include "nspawn-expose-ports.h"
#include "parse-util.h"
#include "socket-util.h"
diff --git a/src/systemd-nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c
index 08cbff9731..02359ca773 100644
--- a/src/systemd-nspawn/nspawn-register.c
+++ b/src/systemd-nspawn/nspawn-register.c
@@ -19,7 +19,7 @@
#include <systemd/sd-bus.h>
-#include "bus-error.h" /* for bus_error_message */
+#include "sd-bus/bus-error.h" /* for bus_error_message */
#include "bus-unit-util.h"
#include "bus-util.h"
#include "nspawn-register.h"