diff options
author | Thomas Haller <thaller@redhat.com> | 2014-07-10 10:41:31 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2015-07-12 13:56:52 +0200 |
commit | 904e9614641fe8203a5f61abaa841b7d186a343b (patch) | |
tree | 110e2f0004e15246e38eae7c6bff0f7fca731141 /libnm-core/nm-setting-private.h | |
parent | 3a338521703dc8be1e0589684c734f870e2c0633 (diff) | |
download | NetworkManager-904e9614641fe8203a5f61abaa841b7d186a343b.tar.gz |
all: remove #if GLIB_CHECK_VERSION conditionals around g_type_init()
g_type_init() is now provided by nm-glib-compat.h as nm_g_type_init().
Diffstat (limited to 'libnm-core/nm-setting-private.h')
-rw-r--r-- | libnm-core/nm-setting-private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h index 2d34d509a5..dc8d7fac20 100644 --- a/libnm-core/nm-setting-private.h +++ b/libnm-core/nm-setting-private.h @@ -92,7 +92,7 @@ gboolean _nm_setting_clear_secrets_with_flags (NMSetting *setting, /* Ensure the setting's GType is registered at library load time */ #define NM_SETTING_REGISTER_TYPE(x) \ static void __attribute__((constructor)) register_setting (void) \ -{ g_type_init (); g_type_ensure (x); } +{ nm_g_type_init (); g_type_ensure (x); } GVariant *_nm_setting_get_deprecated_virtual_interface_name (NMSetting *setting, NMConnection *connection, |