diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-03-11 10:25:40 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-03-11 11:02:12 +0100 |
| commit | aed3c810b3681fa38000487f519660a338bc063e (patch) | |
| tree | 080613a6399809f22c40f07dff09e0ae1dadc81c /src/main.c | |
| parent | e1e428b21e56cad3c50419e3fe2806dbbb21c976 (diff) | |
| download | NetworkManager-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/main.c')
| -rw-r--r-- | src/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c index 9bbc299e58..bf007008b1 100644 --- a/src/main.c +++ b/src/main.c @@ -35,9 +35,9 @@ #include <string.h> #include <sys/resource.h> +#include "main-utils.h" #include "nm-dbus-interface.h" #include "NetworkManagerUtils.h" -#include "main-utils.h" #include "nm-manager.h" #include "nm-linux-platform.h" #include "nm-bus-manager.h" @@ -50,7 +50,7 @@ #include "nm-auth-manager.h" #include "nm-core-internal.h" #include "nm-exported-object.h" -#include "nm-sd-adapt.h" +#include "nm-sd.h" #if !defined(NM_DIST_VERSION) # define NM_DIST_VERSION VERSION |