summaryrefslogtreecommitdiff
path: root/src/devices/nm-lldp-listener.c
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-03-11 10:25:40 +0100
committerThomas Haller <thaller@redhat.com>2016-03-11 11:02:12 +0100
commitaed3c810b3681fa38000487f519660a338bc063e (patch)
tree080613a6399809f22c40f07dff09e0ae1dadc81c /src/devices/nm-lldp-listener.c
parente1e428b21e56cad3c50419e3fe2806dbbb21c976 (diff)
downloadNetworkManager-aed3c810b3681fa38000487f519660a338bc063e.tar.gz
systemd: split "nm-sd.h" out of "nm-sd-adapt.h"
Now we have: "nm-sd.h" is a header file of NetworkManager with utilities related to systemd. It can be used anywhere freely. Also, systemd headers that are considered public API (like "sd-event.h") can be used without restrictions. When compiling the systemd sources, we always must include "nm-sd-adapt.h" as first. Similarly, systemd headers must not include "nm-sd-adapt.h", because they are either public (in which case the adapter is not needed) or they are internal (in which case they are themself included via a systemd source). Sometimes, we must internal API (like "dhcp-lease-internal.h"). In this case, we also must include "nm-sd-adapt.h".
Diffstat (limited to 'src/devices/nm-lldp-listener.c')
-rw-r--r--src/devices/nm-lldp-listener.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/devices/nm-lldp-listener.c b/src/devices/nm-lldp-listener.c
index 39e7a406b4..fe53a179c2 100644
--- a/src/devices/nm-lldp-listener.c
+++ b/src/devices/nm-lldp-listener.c
@@ -20,15 +20,19 @@
#include "nm-default.h"
+#include "nm-lldp-listener.h"
+
#include <net/ethernet.h>
#include <errno.h>
-#include "sd-lldp.h"
-#include "lldp.h"
-#include "nm-lldp-listener.h"
#include "nm-platform.h"
#include "nm-utils.h"
+#include "sd-lldp.h"
+
+#include "nm-sd-adapt.h"
+#include "lldp.h"
+
#define MAX_NEIGHBORS 4096
#define MIN_UPDATE_INTERVAL 2