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/adsl | |
| 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/adsl')
| -rw-r--r-- | src/devices/adsl/nm-atm-manager.h | 4 | ||||
| -rw-r--r-- | src/devices/adsl/nm-device-adsl.h | 7 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/devices/adsl/nm-atm-manager.h b/src/devices/adsl/nm-atm-manager.h index fe0bc14c4e..bcbc6c77bc 100644 --- a/src/devices/adsl/nm-atm-manager.h +++ b/src/devices/adsl/nm-atm-manager.h @@ -22,10 +22,6 @@ #ifndef __NETWORKMANAGER_ATM_MANAGER_H__ #define __NETWORKMANAGER_ATM_MANAGER_H__ -#include "nm-default.h" - -G_BEGIN_DECLS - #define NM_TYPE_ATM_MANAGER (nm_atm_manager_get_type ()) #define NM_ATM_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ATM_MANAGER, NMAtmManager)) diff --git a/src/devices/adsl/nm-device-adsl.h b/src/devices/adsl/nm-device-adsl.h index efcdaf6980..cfde2b3529 100644 --- a/src/devices/adsl/nm-device-adsl.h +++ b/src/devices/adsl/nm-device-adsl.h @@ -23,11 +23,8 @@ #define __NETWORKMANAGER_DEVICE_ADSL_H__ // Parent class -#include "nm-default.h" #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_ADSL (nm_device_adsl_get_type ()) #define NM_DEVICE_ADSL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ADSL, NMDeviceAdsl)) #define NM_DEVICE_ADSL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_ADSL, NMDeviceAdslClass)) @@ -52,6 +49,4 @@ NMDevice *nm_device_adsl_new (const char *udi, const char *driver, int atm_index); -G_END_DECLS - -#endif /* NM_DEVICE_ADSL_H */ +#endif /* NM_DEVICE_ADSL_H */ |