Merge remote-tracking branch 'salsa/upstream' into upstream

1 files changed, 3 insertions, 3 deletions

diff --git a/libnm-util/nm-setting-private.h b/libnm-util/nm-setting-private.h
index e2e02398..9b8e9464 100644
--- a/libnm-util/nm-setting-private.h
+++ b/libnm-util/nm-setting-private.h
@@ -58,7 +58,7 @@ gboolean _nm_setting_type_is_base_type (GType type);
 guint32 _nm_setting_get_setting_priority (NMSetting *setting);
 GType _nm_setting_lookup_setting_type (const char *name);
 GType _nm_setting_lookup_setting_type_by_quark (GQuark error_quark);
-gint _nm_setting_compare_priority (gconstpointer a, gconstpointer b);
+int _nm_setting_compare_priority (gconstpointer a, gconstpointer b);
 
 gboolean _nm_setting_get_property (NMSetting *setting, const char *name, GValue *value);
 
@@ -113,8 +113,8 @@ NMSettingVerifyResult _nm_setting_verify_deprecated_virtual_iface_name (const ch
                                                                         const char *setting_name,
                                                                         const char *setting_property,
                                                                         GQuark error_quark,
-                                                                        gint e_invalid_property,
-                                                                        gint e_missing_property,
+                                                                        int e_invalid_property,
+                                                                        int e_missing_property,
                                                                         GSList *all_settings,
                                                                         GError **error);