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/settings/plugins/ifnet/net_utils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/settings/plugins/ifnet/net_utils.c') diff --git a/src/settings/plugins/ifnet/net_utils.c b/src/settings/plugins/ifnet/net_utils.c index 1c72e0b2..1944e478 100644 --- a/src/settings/plugins/ifnet/net_utils.c +++ b/src/settings/plugins/ifnet/net_utils.c @@ -19,17 +19,17 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include #include #include #include -#include + +#include "nm-utils.h" #include "NetworkManagerUtils.h" -#include +#include "nm-settings-plugin.h" #include "nm-config.h" -#include "nm-default.h" #include "net_utils.h" #include "wpa_parser.h" #include "net_parser.h" @@ -712,7 +712,7 @@ _has_prefix_impl (char *str, const char *prefix, gsize prefix_len) } while (g_ascii_isspace (str[0])); return str; } -#define _has_prefix(STR, PREFIX) _has_prefix_impl (STR, PREFIX, STRLEN (PREFIX)) +#define _has_prefix(STR, PREFIX) _has_prefix_impl (STR, PREFIX, NM_STRLEN (PREFIX)) void get_dhcp_hostname_and_client_id (char **hostname, char **client_id) -- cgit 1.3.0-6-gf8a5