summaryrefslogtreecommitdiff
path: root/callouts
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-07-17 14:38:54 +0200
committerThomas Haller <thaller@redhat.com>2015-08-05 15:32:40 +0200
commit19c3ea948a7c74774621baf62d68cb4826e1b97c (patch)
treebb6300533ff66d0864b3e91935e3320786d2850e /callouts
parent9ac57182ca2a551f2c7dafa331b8daf74dc78e1c (diff)
downloadNetworkManager-19c3ea948a7c74774621baf62d68cb4826e1b97c.tar.gz
all: make use of new header file "nm-default.h"
Diffstat (limited to 'callouts')
-rw-r--r--callouts/nm-dispatcher-utils.c2
-rw-r--r--callouts/nm-dispatcher-utils.h2
-rw-r--r--callouts/nm-dispatcher.c2
-rw-r--r--callouts/tests/test-dispatcher-envp.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c
index b930e269f2..52eddfdab6 100644
--- a/callouts/nm-dispatcher-utils.c
+++ b/callouts/nm-dispatcher-utils.c
@@ -29,7 +29,7 @@
#include <nm-setting-ip6-config.h>
#include <nm-setting-connection.h>
-#include "nm-glib.h"
+#include "nm-default.h"
#include "nm-dispatcher-api.h"
#include "nm-utils.h"
diff --git a/callouts/nm-dispatcher-utils.h b/callouts/nm-dispatcher-utils.h
index be67787d6f..f68b3ea6ae 100644
--- a/callouts/nm-dispatcher-utils.h
+++ b/callouts/nm-dispatcher-utils.h
@@ -21,7 +21,7 @@
#ifndef __NETWORKMANAGER_DISPATCHER_UTILS_H__
#define __NETWORKMANAGER_DISPATCHER_UTILS_H__
-#include "nm-glib.h"
+#include "nm-default.h"
char **
nm_dispatcher_utils_construct_envp (const char *action,
diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c
index ef6f2a96bd..32b60e8a29 100644
--- a/callouts/nm-dispatcher.c
+++ b/callouts/nm-dispatcher.c
@@ -34,7 +34,7 @@
#include <glib-unix.h>
-#include "nm-glib.h"
+#include "nm-default.h"
#include "nm-dispatcher-api.h"
#include "nm-dispatcher-utils.h"
diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c
index c6516b308e..faa6c085a0 100644
--- a/callouts/tests/test-dispatcher-envp.c
+++ b/callouts/tests/test-dispatcher-envp.c
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <string.h>
-#include "nm-glib.h"
+#include "nm-default.h"
#include "nm-core-internal.h"
#include "nm-dispatcher-utils.h"
#include "nm-dispatcher-api.h"