diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2014-09-27 09:03:17 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-01-26 13:05:06 +0100 |
| commit | 0d59984ce837581ff78ce747d1fcf6e393b6beb5 (patch) | |
| tree | deecc83d6a3795814cef782a45f0e9cb6bccace2 | |
| parent | 2d08e701a02e857f7301736f6f528cb149db32c2 (diff) | |
| download | NetworkManager-0d59984ce837581ff78ce747d1fcf6e393b6beb5.tar.gz | |
core: Add NMUtilsIPv6IfaceId to nm-types.h
We'd like to use it in nm-platform.h, but it's included by
NetworkManagerUtils.h before the declaration occurs.
| -rw-r--r-- | src/NetworkManagerUtils.h | 4 | ||||
| -rw-r--r-- | src/nm-types.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index 191c19ce9d..0498565562 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -186,12 +186,12 @@ gboolean nm_utils_is_specific_hostname (const char *name); * and should not normally be treated as a %guint64, but this is done for * convenience of validity checking and initialization. */ -typedef struct { +struct _NMUtilsIPv6IfaceId { union { guint64 id; guint8 id_u8[8]; }; -} NMUtilsIPv6IfaceId; +}; #define NM_UTILS_IPV6_IFACE_ID_INIT { .id = 0 } diff --git a/src/nm-types.h b/src/nm-types.h index 4a93567e11..73a11e7567 100644 --- a/src/nm-types.h +++ b/src/nm-types.h @@ -111,4 +111,7 @@ typedef struct _NMSecretAgent NMSecretAgent; typedef struct _NMSettings NMSettings; typedef struct _NMSettingsConnection NMSettingsConnection; +/* utils */ +typedef struct _NMUtilsIPv6IfaceId NMUtilsIPv6IfaceId; + #endif /* NM_TYPES_H */ |