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/nm-dispatcher.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/nm-dispatcher.c') diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c index dad48520..c0238fc5 100644 --- a/src/nm-dispatcher.c +++ b/src/nm-dispatcher.c @@ -19,12 +19,11 @@ * Copyright (C) 2005 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include #include -#include "nm-default.h" #include "nm-dispatcher.h" #include "nm-dispatcher-api.h" #include "NetworkManagerUtils.h" @@ -58,7 +57,7 @@ enum { }; static Monitor monitors[3] = { -#define MONITORS_INIT_SET(INDEX, USE, SCRIPT_DIR) [INDEX] = { .dir_len = STRLEN (SCRIPT_DIR), .dir = SCRIPT_DIR, .description = ("" USE), .has_scripts = TRUE } +#define MONITORS_INIT_SET(INDEX, USE, SCRIPT_DIR) [INDEX] = { .dir_len = NM_STRLEN (SCRIPT_DIR), .dir = SCRIPT_DIR, .description = ("" USE), .has_scripts = TRUE } MONITORS_INIT_SET (MONITOR_INDEX_DEFAULT, "default", NMD_SCRIPT_DIR_DEFAULT), MONITORS_INIT_SET (MONITOR_INDEX_PRE_UP, "pre-up", NMD_SCRIPT_DIR_PRE_UP), MONITORS_INIT_SET (MONITOR_INDEX_PRE_DOWN, "pre-down", NMD_SCRIPT_DIR_PRE_DOWN), -- cgit 1.3.0-6-gf8a5