diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-09-27 13:35:29 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-09-27 14:13:21 +0200 |
| commit | e3a072f3c0d8046a9c1d01c8518c532b71f7bd7a (patch) | |
| tree | fc59e7b009a14227dd825be31ad7bd0c59b41ae9 /src/systemd | |
| parent | 3f4aa48d6bc7302ffb38eda2d3c674f747516f37 (diff) | |
| download | NetworkManager-e3a072f3c0d8046a9c1d01c8518c532b71f7bd7a.tar.gz | |
build: don't add systemd path the include search path
Our internal copy of systemd should not be in the search path.
Instead, let users only
#include "systemd/nm-sd.h"
which then includes everything from systemd that we need.
We want to avoid to accidentally include anything from our
systemd-copy. Any user of that should only include "nm-sd.h",
which then includes everything that is needed further.
For example, "src/devices/wwan/nm-modem-manager.c" has
#include <systemd/nm-daemon.h>
which in turn includes
#include "_sd-common.h"
This works all correctly before, because #include "" will first
look in the directory where sd-daemon.h is. However, our mixing of
external systemd library and internal copy is rather dangerous.
Try to avoid it further by keeping the include paths clean.
Diffstat (limited to 'src/systemd')
| -rw-r--r-- | src/systemd/nm-sd.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/systemd/nm-sd.h b/src/systemd/nm-sd.h index f07a708269..f988dfd08f 100644 --- a/src/systemd/nm-sd.h +++ b/src/systemd/nm-sd.h @@ -19,6 +19,13 @@ #ifndef __NM_SD_H__ #define __NM_SD_H__ +#include "systemd/src/systemd/sd-dhcp-client.h" +#include "systemd/src/systemd/sd-dhcp6-client.h" +#include "systemd/src/systemd/sd-lldp.h" +#include "systemd/src/systemd/sd-ipv4ll.h" + +/*****************************************************************************/ + guint nm_sd_event_attach_default (void); /***************************************************************************** |