diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-08-17 18:19:00 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-08-17 19:51:17 +0200 |
| commit | 0bdcab100ca5fd86ec8ab0f9ccc3645b47835437 (patch) | |
| tree | 50865418973a9ad98def8a7d3e2528e0c9ff98f3 /src/devices/team/nm-device-team.h | |
| parent | 40d5749ec1c9d9aed746115dcf50d9bf1fbad131 (diff) | |
| download | NetworkManager-0bdcab100ca5fd86ec8ab0f9ccc3645b47835437.tar.gz | |
all: cleanup includes in header files
- don't include "nm-default.h" in header files. Every source file must
include as first header "nm-default.h", thus our headers get the
default include already implicitly.
- we don't support compiling NetworkManager itself with a C++ compiler. Remove
G_BEGIN_DECLS/G_END_DECLS from internal headers. We do however support
users of libnm to use C++, thus they stay in public headers.
(cherry picked from commit f19aff89095ca192b8b2e37534b7a899aecd82f9)
Diffstat (limited to 'src/devices/team/nm-device-team.h')
| -rw-r--r-- | src/devices/team/nm-device-team.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/devices/team/nm-device-team.h b/src/devices/team/nm-device-team.h index 27bd8227db..43e8aab408 100644 --- a/src/devices/team/nm-device-team.h +++ b/src/devices/team/nm-device-team.h @@ -23,8 +23,6 @@ #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_TEAM (nm_device_team_get_type ()) #define NM_DEVICE_TEAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_TEAM, NMDeviceTeam)) #define NM_DEVICE_TEAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_TEAM, NMDeviceTeamClass)) @@ -42,6 +40,4 @@ GType nm_device_team_get_type (void); NMDevice *nm_device_team_new (const char *iface); -G_END_DECLS - -#endif /* NM_DEVICE_TEAM_H */ +#endif /* __NETWORKMANAGER_DEVICE_TEAM_H__ */ |