From fb2d11f1f9dba1bcdb713517d20969a479386d8e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 8 Oct 2020 15:42:27 +0200
Subject: [PATCH] all: use _NM_DUMMY_STRUCT_FOR_TRAILING_SEMICOLON define for
 trailing semicolon

---
 shared/nm-glib-aux/nm-macros-internal.h | 2 +-
 src/platform/nmp-object.c               | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h
index db1597fabe..cabe7edcff 100644
--- a/shared/nm-glib-aux/nm-macros-internal.h
+++ b/shared/nm-glib-aux/nm-macros-internal.h
@@ -764,7 +764,7 @@ NM_G_ERROR_MSG(GError *error)
     {                                    \
         return NM_CACHED_QUARK(string);  \
     }                                    \
-    struct _dummy_struct_for_trailing_semicolon
+    _NM_DUMMY_STRUCT_FOR_TRAILING_SEMICOLON
 
 /*****************************************************************************/
 
diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c
index 6eea732f57..cc18e49527 100644
--- a/src/platform/nmp-object.c
+++ b/src/platform/nmp-object.c
@@ -1098,7 +1098,7 @@ _vt_cmd_obj_to_string_lnk_wireguard(const NMPObject *     obj,
         g_snprintf(buf, buf_len, __VA_ARGS__);                                            \
         return buf;                                                                       \
     }                                                                                     \
-    struct _dummy_struct_for_tailing_semicolon
+    _NM_DUMMY_STRUCT_FOR_TRAILING_SEMICOLON
 
 _vt_cmd_plobj_to_string_id(link, NMPlatformLink, "%d", obj->ifindex);
 
@@ -1390,7 +1390,7 @@ _vt_cmd_obj_copy_lnk_wireguard(NMPObject *dst, const NMPObject *src)
             cmd                                                                                    \
         }                                                                                          \
     }                                                                                              \
-    struct _dummy_struct_for_tailing_semicolon
+    _NM_DUMMY_STRUCT_FOR_TRAILING_SEMICOLON
 
 _vt_cmd_plobj_id_copy(link, NMPlatformLink, { dst->ifindex = src->ifindex; });
 
@@ -1485,7 +1485,7 @@ nmp_object_id_cmp(const NMPObject *obj1, const NMPObject *obj2)
         }                                                                 \
         return 0;                                                         \
     }                                                                     \
-    struct _dummy_struct_for_tailing_semicolon
+    _NM_DUMMY_STRUCT_FOR_TRAILING_SEMICOLON
 
 _vt_cmd_plobj_id_cmp(link, NMPlatformLink, { NM_CMP_FIELD(obj1, obj2, ifindex); });
 
@@ -1581,7 +1581,7 @@ nmp_object_id_hash(const NMPObject *obj)
             cmd;                                                                                  \
         }                                                                                         \
     }                                                                                             \
-    struct _dummy_struct_for_tailing_semicolon
+    _NM_DUMMY_STRUCT_FOR_TRAILING_SEMICOLON
 
 _vt_cmd_plobj_id_hash_update(link, NMPlatformLink, { nm_hash_update_val(h, obj->ifindex); });