From c2de0d98ba39e0a1a970d066fd19be786092f376 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 1 Mar 2016 16:55:22 +0100 Subject: Imported Upstream version 1.1.91 --- src/dhcp-manager/tests/test-dhcp-dhclient.c | 8 +++----- src/dhcp-manager/tests/test-dhcp-utils.c | 5 ++--- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'src/dhcp-manager/tests') diff --git a/src/dhcp-manager/tests/test-dhcp-dhclient.c b/src/dhcp-manager/tests/test-dhcp-dhclient.c index f9e1e1eb..0561d43c 100644 --- a/src/dhcp-manager/tests/test-dhcp-dhclient.c +++ b/src/dhcp-manager/tests/test-dhcp-dhclient.c @@ -18,20 +18,18 @@ * */ -#include "config.h" +#include "nm-default.h" #include #include #include -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-dhcp-dhclient-utils.h" #include "nm-dhcp-utils.h" #include "nm-utils.h" #include "nm-ip4-config.h" #include "nm-platform.h" -#include "nm-macros-internal.h" #include "nm-test-utils.h" @@ -295,9 +293,9 @@ static void test_existing_ascii_client_id (void) { gs_unref_bytes GBytes *new_client_id = NULL; - char buf[STRLEN (EACID) + 1] = { 0 }; + char buf[NM_STRLEN (EACID) + 1] = { 0 }; - memcpy (buf + 1, EACID, STRLEN (EACID)); + memcpy (buf + 1, EACID, NM_STRLEN (EACID)); new_client_id = g_bytes_new (buf, sizeof (buf)); test_config (existing_ascii_client_id_orig, existing_ascii_client_id_expected, FALSE, NULL, NULL, diff --git a/src/dhcp-manager/tests/test-dhcp-utils.c b/src/dhcp-manager/tests/test-dhcp-utils.c index 49987c40..38051326 100644 --- a/src/dhcp-manager/tests/test-dhcp-utils.c +++ b/src/dhcp-manager/tests/test-dhcp-utils.c @@ -17,15 +17,14 @@ * */ -#include "config.h" +#include "nm-default.h" #include #include #include -#include +#include "nm-utils.h" -#include "nm-default.h" #include "nm-dhcp-utils.h" #include "nm-platform.h" -- cgit 1.3.0-6-gf8a5