From daebb11af8edd33c0a2fbf737ee059c47de75c16 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 2 May 2021 09:50:32 +0200
Subject: [PATCH] glib-aux: move NMUuid to "src/libnm-glib-aux/nm-uuid.h"

---
 src/libnm-core-intern/nm-core-internal.h | 5 +----
 src/libnm-glib-aux/nm-uuid.h             | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h
index c3d4273062..cc396483dc 100644
--- a/src/libnm-core-intern/nm-core-internal.h
+++ b/src/libnm-core-intern/nm-core-internal.h
@@ -21,6 +21,7 @@
 #endif
 
 #include "libnm-base/nm-base.h"
+#include "libnm-glib-aux/nm-uuid.h"
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"
 #include "nm-meta-setting-base.h"
@@ -351,10 +352,6 @@ gboolean _nm_utils_check_module_file(const char *              name,
 
 /*****************************************************************************/
 
-typedef struct _NMUuid {
-    guchar uuid[16];
-} NMUuid;
-
 NMUuid *_nm_utils_uuid_parse(const char *str, NMUuid *uuid);
 char *  _nm_utils_uuid_unparse(const NMUuid *uuid, char *out_str /*[37]*/);
 NMUuid *_nm_utils_uuid_generate_random(NMUuid *out_uuid);
diff --git a/src/libnm-glib-aux/nm-uuid.h b/src/libnm-glib-aux/nm-uuid.h
index e1ef9bf65c..dea52b94ce 100644
--- a/src/libnm-glib-aux/nm-uuid.h
+++ b/src/libnm-glib-aux/nm-uuid.h
@@ -3,4 +3,8 @@
 #ifndef __NM_UUID_H__
 #define __NM_UUID_H__
 
+typedef struct _NMUuid {
+    guint8 uuid[16];
+} NMUuid;
+
 #endif /* __NM_UUID_H__ */