diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-06-01 13:48:34 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-06-07 09:07:17 +0200 |
| commit | c7e9f97800ed350340e38371ac38cad590136516 (patch) | |
| tree | a3aef6bd1a0f45883cad0e1b9bc8863dc7a47130 /libnm-core/nm-setting-private.h | |
| parent | 11d852a14895404f1a954b55674353a14c1b35a2 (diff) | |
| download | NetworkManager-c7e9f97800ed350340e38371ac38cad590136516.tar.gz | |
libnm/trivial: rename _nm_register_setting function to _nm_register_setting_impl
Avoid having the function _nm_register_setting() shadowed by a macro
of the same name, but different behavior/arguments.
Diffstat (limited to 'libnm-core/nm-setting-private.h')
| -rw-r--r-- | libnm-core/nm-setting-private.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h index 3d6e2d4d86..471de323a6 100644 --- a/libnm-core/nm-setting-private.h +++ b/libnm-core/nm-setting-private.h @@ -27,13 +27,13 @@ #include "nm-core-internal.h" -void _nm_register_setting (const char *name, - const GType type, - const guint32 priority); +void _nm_register_setting_impl (const char *name, + const GType type, + const guint32 priority); #define _nm_register_setting(name, priority) \ G_STMT_START { \ - _nm_register_setting (NM_SETTING_ ## name ## _SETTING_NAME "", g_define_type_id, priority); \ + _nm_register_setting_impl ("" NM_SETTING_ ## name ## _SETTING_NAME "", g_define_type_id, priority); \ } G_STMT_END guint32 _nm_setting_get_base_type_priority (NMSetting *setting); |