diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-01 16:55:22 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-01 16:55:22 +0100 |
| commit | c2de0d98ba39e0a1a970d066fd19be786092f376 (patch) | |
| tree | 3838363c06a6019db6cf1f882ea34ebded63c38b /src/rdisc | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Imported Upstream version 1.1.91 upstream/1.1.91
Diffstat (limited to 'src/rdisc')
| -rw-r--r-- | src/rdisc/nm-fake-rdisc.c | 4 | ||||
| -rw-r--r-- | src/rdisc/nm-lndp-rdisc.c | 3 | ||||
| -rw-r--r-- | src/rdisc/nm-rdisc.c | 3 | ||||
| -rw-r--r-- | src/rdisc/tests/test-rdisc-fake.c | 3 | ||||
| -rw-r--r-- | src/rdisc/tests/test-rdisc-linux.c | 3 |
5 files changed, 5 insertions, 11 deletions
diff --git a/src/rdisc/nm-fake-rdisc.c b/src/rdisc/nm-fake-rdisc.c index 001fd938..6a1585b3 100644 --- a/src/rdisc/nm-fake-rdisc.c +++ b/src/rdisc/nm-fake-rdisc.c @@ -18,7 +18,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> @@ -26,8 +26,6 @@ #include "nm-fake-rdisc.h" #include "nm-rdisc-private.h" -#include "nm-default.h" - #define _NMLOG_PREFIX_NAME "rdisc-fake" typedef struct { diff --git a/src/rdisc/nm-lndp-rdisc.c b/src/rdisc/nm-lndp-rdisc.c index 46000994..06863462 100644 --- a/src/rdisc/nm-lndp-rdisc.c +++ b/src/rdisc/nm-lndp-rdisc.c @@ -18,7 +18,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> @@ -30,7 +30,6 @@ #include "nm-rdisc-private.h" #include "NetworkManagerUtils.h" -#include "nm-default.h" #include "nm-platform.h" #define _NMLOG_PREFIX_NAME "rdisc-lndp" diff --git a/src/rdisc/nm-rdisc.c b/src/rdisc/nm-rdisc.c index 6133ae28..82aece30 100644 --- a/src/rdisc/nm-rdisc.c +++ b/src/rdisc/nm-rdisc.c @@ -18,7 +18,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <arpa/inet.h> @@ -27,7 +27,6 @@ #include "nm-rdisc.h" #include "nm-rdisc-private.h" -#include "nm-default.h" #include "nm-utils.h" #include <nm-setting-ip6-config.h> diff --git a/src/rdisc/tests/test-rdisc-fake.c b/src/rdisc/tests/test-rdisc-fake.c index ad045cff..00a98dca 100644 --- a/src/rdisc/tests/test-rdisc-fake.c +++ b/src/rdisc/tests/test-rdisc-fake.c @@ -18,14 +18,13 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <syslog.h> #include "nm-rdisc.h" #include "nm-fake-rdisc.h" -#include "nm-default.h" #include "nm-fake-platform.h" diff --git a/src/rdisc/tests/test-rdisc-linux.c b/src/rdisc/tests/test-rdisc-linux.c index b93c50a7..bbdb5fb8 100644 --- a/src/rdisc/tests/test-rdisc-linux.c +++ b/src/rdisc/tests/test-rdisc-linux.c @@ -18,14 +18,13 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <syslog.h> #include "nm-rdisc.h" #include "nm-lndp-rdisc.h" -#include "nm-default.h" #include "nm-linux-platform.h" |