From b62f9008668a5330c61b4de7e0d48147bcd1edf7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 4 Oct 2018 18:54:58 +0200 Subject: [PATCH] dhcp6: don't include internal header "sparse-endian.h" in "sd-dhcp6-client.h" Arguably, libsystemd-network is (still) entirely internal API. However there is the aim of maybe exposing it as public API. For that reason, it cannot include internal headers from "src/basic/". Note how files "src/systemd/sd-*.h" don't include any systemd headers which don't themself have an "sd-" prefix. Fixes: d89a400ed664e0b57fd8667db5637792a185e831 --- src/libsystemd-network/sd-dhcp6-client.c | 2 +- src/systemd/sd-dhcp6-client.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index 9b9e9610e4..c07d831f7d 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -368,7 +368,7 @@ int sd_dhcp6_client_set_address_request(sd_dhcp6_client *client, int request) { return 0; } -int sd_dhcp6_client_set_transaction_id(sd_dhcp6_client *client, be32_t transaction_id) { +int sd_dhcp6_client_set_transaction_id(sd_dhcp6_client *client, uint32_t transaction_id) { assert_return(client, -EINVAL); client->transaction_id = transaction_id; diff --git a/src/systemd/sd-dhcp6-client.h b/src/systemd/sd-dhcp6-client.h index 639339d181..43d38f5c7d 100644 --- a/src/systemd/sd-dhcp6-client.h +++ b/src/systemd/sd-dhcp6-client.h @@ -25,7 +25,6 @@ #include "sd-dhcp6-lease.h" #include "sd-event.h" -#include "sparse-endian.h" #include "_sd-common.h" @@ -128,7 +127,7 @@ int sd_dhcp6_client_get_address_request(sd_dhcp6_client *client, int *request); int sd_dhcp6_client_set_address_request(sd_dhcp6_client *client, int request); -int sd_dhcp6_client_set_transaction_id(sd_dhcp6_client *client, be32_t transaction_id); +int sd_dhcp6_client_set_transaction_id(sd_dhcp6_client *client, uint32_t transaction_id); int sd_dhcp6_client_get_lease( sd_dhcp6_client *client,