[PATCH 2/2] dhcp: Add missing include to systemd DHCP client
- From: Iñigo Martínez <inigomartinez gmail com>
- To: networkmanager-list gnome org
- Subject: [PATCH 2/2] dhcp: Add missing include to systemd DHCP client
- Date: Fri, 5 Jan 2018 14:17:55 +0100
In a recent commit 686afe531ab3774cd818feda8361de74101971f5, a new
macro called `_NM_SD_MAX_CLIENT_ID_LEN` was introduced. However, the
systemd DHCP client handler did not include the file where the
macro was defined, `nm-types.h`. Although this worked in autotools,
it fails on meson.
The include has been added to the `sd-dhcp-client.c` file and due
to two existing `nm-types.h` files, to avoid any issue finding the
macro, the `libnm` directory include has been removed.
---
src/systemd/meson.build | 1 -
src/systemd/src/libsystemd-network/sd-dhcp-client.c | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/systemd/meson.build b/src/systemd/meson.build
index 02889ce24..0d9213b29 100644
--- a/src/systemd/meson.build
+++ b/src/systemd/meson.build
@@ -54,7 +54,6 @@ incs = [
top_inc,
shared_inc,
libnm_core_inc,
- libnm_inc,
src_inc,
include_directories(
'sd-adapt',
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-client.c
b/src/systemd/src/libsystemd-network/sd-dhcp-client.c
index a88908e44..6a6055131 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp-client.c
@@ -19,6 +19,7 @@
***/
#include "nm-sd-adapt.h"
+#include "nm-types.h"
#include <errno.h>
#include <net/ethernet.h>
--
2.15.1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]