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/nm-sleep-monitor.h | |
| 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/nm-sleep-monitor.h')
| -rw-r--r-- | src/nm-sleep-monitor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h index 173e6a1369..00eeaa03af 100644 --- a/src/nm-sleep-monitor.h +++ b/src/nm-sleep-monitor.h @@ -22,6 +22,8 @@ #include <glib-object.h> +#include "nm-types.h" + G_BEGIN_DECLS #define NM_TYPE_SLEEP_MONITOR (nm_sleep_monitor_get_type ()) @@ -34,7 +36,6 @@ G_BEGIN_DECLS #define NM_SLEEP_MONITOR_SLEEPING "sleeping" #define NM_SLEEP_MONITOR_RESUMING "resuming" -typedef struct _NMSleepMonitor NMSleepMonitor; typedef struct _NMSleepMonitorClass NMSleepMonitorClass; GType nm_sleep_monitor_get_type (void) G_GNUC_CONST; |