From 67da0a28db834192d207fb315a3ba1983fe4a79e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 27 Apr 2017 12:35:21 +0200
Subject: [PATCH] core: move NMIPAddr to nm-core-utils.h

---
 src/nm-core-utils.c        |  4 ++++
 src/nm-core-utils.h        | 19 +++++++++++++++++++
 src/platform/nm-platform.c |  4 ----
 src/platform/nm-platform.h | 18 ------------------
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index f5180be399..96228a9dce 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -110,6 +110,10 @@ _nm_utils_set_testing (NMUtilsTestFlags flags)
 
 /*****************************************************************************/
 
+const NMIPAddr nm_ip_addr_zero = NMIPAddrInit;
+
+/*****************************************************************************/
+
 static GSList *_singletons = NULL;
 static gboolean _singletons_shutdown = FALSE;
 
diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
index 0875dc32ca..e39b5f65f8 100644
--- a/src/nm-core-utils.h
+++ b/src/nm-core-utils.h
@@ -90,6 +90,25 @@ GETTER (void) \
 
 /*****************************************************************************/
 
+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 NMIPAddrInit { .addr6 = IN6ADDR_ANY_INIT }
+
+/*****************************************************************************/
+
 gboolean nm_ethernet_address_is_valid (gconstpointer addr, gssize len);
 
 gconstpointer nm_utils_ipx_address_clear_host_address (int family, gpointer dst, gconstpointer src, guint8 plen);
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index 7ef22ad5ab..767187d96b 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -43,10 +43,6 @@
 
 /*****************************************************************************/
 
-const NMIPAddr nm_ip_addr_zero = NMIPAddrInit;
-
-/*****************************************************************************/
-
 G_STATIC_ASSERT (sizeof ( ((NMPlatformLink *) NULL)->addr.data ) == NM_UTILS_HWADDR_LEN_MAX);
 G_STATIC_ASSERT (G_STRUCT_OFFSET (NMPlatformIPAddress, address_ptr) == G_STRUCT_OFFSET (NMPlatformIP4Address, address));
 G_STATIC_ASSERT (G_STRUCT_OFFSET (NMPlatformIPAddress, address_ptr) == G_STRUCT_OFFSET (NMPlatformIP6Address, address));
diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
index f1679fd113..43be17fa0c 100644
--- a/src/platform/nm-platform.h
+++ b/src/platform/nm-platform.h
@@ -93,24 +93,6 @@ typedef enum { /*< skip >*/
 	NM_PLATFORM_ERROR_OPNOTSUPP,
 } NMPlatformError;
 
-
-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 NMIPAddrInit { .addr6 = IN6ADDR_ANY_INIT }
-
 #define NM_PLATFORM_LINK_OTHER_NETNS    (-1)
 
 #define __NMPlatformObject_COMMON \