diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-11-07 19:50:10 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-11-13 11:35:44 +0100 |
| commit | 632e8ac885d205c83c6140f8145cd65cd1c98b14 (patch) | |
| tree | 42338904d8a493ba4a2bb1874bf9e23505badcb7 /shared | |
| parent | 8948dbe117c45227f4c7c1e57a0c0785c6f06a1c (diff) | |
| download | NetworkManager-632e8ac885d205c83c6140f8145cd65cd1c98b14.tar.gz | |
shared/trivial: move code
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/nm-utils/nm-shared-utils.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/shared/nm-utils/nm-shared-utils.h b/shared/nm-utils/nm-shared-utils.h index 96aab5341e..a118cf819a 100644 --- a/shared/nm-utils/nm-shared-utils.h +++ b/shared/nm-utils/nm-shared-utils.h @@ -26,23 +26,6 @@ /*****************************************************************************/ -typedef struct { - union { - guint8 addr_ptr[1]; - in_addr_t addr4; - struct in6_addr addr6; - - /* NMIPAddr is really a union for IP addresses. - * However, as ethernet addresses fit in here nicely, use - * it also for an ethernet MAC address. */ - guint8 addr_eth[6 /*ETH_ALEN*/]; - }; -} NMIPAddr; - -extern const NMIPAddr nm_ip_addr_zero; - -/*****************************************************************************/ - static inline char nm_utils_addr_family_to_char (int addr_family) { @@ -68,6 +51,23 @@ nm_utils_addr_family_to_size (int addr_family) /*****************************************************************************/ +typedef struct { + union { + guint8 addr_ptr[1]; + in_addr_t addr4; + struct in6_addr addr6; + + /* NMIPAddr is really a union for IP addresses. + * However, as ethernet addresses fit in here nicely, use + * it also for an ethernet MAC address. */ + guint8 addr_eth[6 /*ETH_ALEN*/]; + }; +} NMIPAddr; + +extern const NMIPAddr nm_ip_addr_zero; + +/*****************************************************************************/ + #define NM_CMP_RETURN(c) \ G_STMT_START { \ const int _cc = (c); \ |