diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-05-30 11:13:41 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-05-31 15:59:38 +0200 |
| commit | 82b088ab5f8b619cbbd187d1906e196deaf759ef (patch) | |
| tree | a78cebbd08e00411eafc6d8435cf024680caaf97 /src/systemd | |
| parent | cdbd99c5d5b5a62c5d4bf4d5e7a49e97e307d987 (diff) | |
| download | NetworkManager-82b088ab5f8b619cbbd187d1906e196deaf759ef.tar.gz | |
build: don't add shared/nm-utils directory to include search path
All users are supposed to include files from nm-utils by fully specifying
the path. -I.*shared/nm-utils is wrong.
Only, systemd code likes to include "siphash24.h" directly. Instead of
adding "-Ishared/nm-utils" to the search path, add an intermediary
header to sd-adapt. Note, that in the meantime we anyway should rework
siphash24 to use shared/c-siphash instead.
This also fixes build for meson, which was broken recently.
Diffstat (limited to 'src/systemd')
| -rw-r--r-- | src/systemd/sd-adapt/siphash24.h | 3 | ||||
| -rw-r--r-- | src/systemd/sd-adapt/unaligned.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/systemd/sd-adapt/siphash24.h b/src/systemd/sd-adapt/siphash24.h new file mode 100644 index 0000000000..ac6e5a1d13 --- /dev/null +++ b/src/systemd/sd-adapt/siphash24.h @@ -0,0 +1,3 @@ +#pragma once + +#include "nm-utils/siphash24.h" diff --git a/src/systemd/sd-adapt/unaligned.h b/src/systemd/sd-adapt/unaligned.h new file mode 100644 index 0000000000..17dc04446c --- /dev/null +++ b/src/systemd/sd-adapt/unaligned.h @@ -0,0 +1,3 @@ +#pragma once + +#include "nm-utils/unaligned.h" |