diff options
| author | Dan Winship <danw@gnome.org> | 2014-07-17 17:06:44 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-07-23 10:56:26 -0400 |
| commit | b28f6526c27b920827416315f13ca051bf5a644d (patch) | |
| tree | dc8a924222fc59fe15091558f23d02c576dd3a0c /src/tests | |
| parent | b7c7832ae87054bdf4138d0c509a3a31504f69cf (diff) | |
| download | NetworkManager-b28f6526c27b920827416315f13ca051bf5a644d.tar.gz | |
core: fill in nm-types.h, clean out other headers
Clean up some of the cross-includes between headers (which made it so
that, eg, if you included NetworkManagerUtils.h in a test program, you
would need to build the test with -I$(top_srcdir)/src/platform, and if
you included nm-device.h you'd need $(POLKIT_CFLAGS)) by moving all
GObject struct definitions for src/ and src/settings/ into nm-types.h
(which already existed to solve the NMDevice/NMActRequest circular
references).
Update various .c files to explicitly include the headers they used to
get implicitly, and remove some now-unnecessary -I options from
Makefiles.
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/Makefile.am | 1 | ||||
| -rw-r--r-- | src/tests/test-ip4-config.c | 1 | ||||
| -rw-r--r-- | src/tests/test-ip6-config.c | 1 | ||||
| -rw-r--r-- | src/tests/test-resolvconf-capture.c | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index e4e6b3c369..ab7ae72b1e 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -4,7 +4,6 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/platform \ - -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/dhcp-manager \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c index 3eee5f1366..0032b8f7a7 100644 --- a/src/tests/test-ip4-config.c +++ b/src/tests/test-ip4-config.c @@ -23,6 +23,7 @@ #include <arpa/inet.h> #include "nm-ip4-config.h" +#include "nm-platform.h" static void addr_init (NMPlatformIP4Address *a, const char *addr, const char *peer, guint plen) diff --git a/src/tests/test-ip6-config.c b/src/tests/test-ip6-config.c index 75fe28eef6..2177241de5 100644 --- a/src/tests/test-ip6-config.c +++ b/src/tests/test-ip6-config.c @@ -25,6 +25,7 @@ #include "nm-ip6-config.h" #include "nm-logging.h" +#include "nm-platform.h" #include "nm-test-utils.h" static NMIP6Config * diff --git a/src/tests/test-resolvconf-capture.c b/src/tests/test-resolvconf-capture.c index cde4bbe5be..2d787b7188 100644 --- a/src/tests/test-resolvconf-capture.c +++ b/src/tests/test-resolvconf-capture.c @@ -22,6 +22,8 @@ #include <string.h> #include "NetworkManagerUtils.h" +#include "nm-ip4-config.h" +#include "nm-ip6-config.h" #include "nm-platform.h" static void |