From 06b30ad690942bd421ddcfc4e55834174ec708f6 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sat, 27 Sep 2014 09:03:17 +0200 Subject: [PATCH] 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. (cherry picked from commit 0d59984ce837581ff78ce747d1fcf6e393b6beb5) --- src/NetworkManagerUtils.h | 4 ++-- src/nm-types.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index d687c6a391..2a1101da92 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -192,12 +192,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 8d613a22cc..7229eba8b0 100644 --- a/src/nm-types.h +++ b/src/nm-types.h @@ -113,4 +113,7 @@ typedef struct _NMSecretAgent NMSecretAgent; typedef struct _NMSettings NMSettings; typedef struct _NMSettingsConnection NMSettingsConnection; +/* utils */ +typedef struct _NMUtilsIPv6IfaceId NMUtilsIPv6IfaceId; + #endif /* NM_TYPES_H */