diff options
| author | Antonio Cardace <acardace@redhat.com> | 2020-03-11 16:53:21 +0100 |
|---|---|---|
| committer | Antonio Cardace <acardace@redhat.com> | 2020-03-13 10:22:21 +0100 |
| commit | cbb45aaf909b53db6eb5cff208a4e08fde699041 (patch) | |
| tree | 3341816171fe430ab698de6fcf013856d6147d2e | |
| parent | 219ee9a9e8bcbd8f83a7736f0c68fc5376befe9b (diff) | |
| download | NetworkManager-cbb45aaf909b53db6eb5cff208a4e08fde699041.tar.gz | |
libnm: cleanup 'NML_DBUS_META_IFACE_INIT_PROP' macro
| -rw-r--r-- | libnm/nm-libnm-utils.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h index 28c9c1164c..d2af800091 100644 --- a/libnm/nm-libnm-utils.h +++ b/libnm/nm-libnm-utils.h @@ -544,7 +544,7 @@ struct _NMLDBusMetaIface { #define NML_DBUS_META_IFACE_DBUS_PROPERTIES(...) \ .dbus_properties = ((const NMLDBusMetaProperty []) { __VA_ARGS__ }), \ - .n_dbus_properties = sizeof ((const NMLDBusMetaProperty []) { __VA_ARGS__ }) / sizeof (NMLDBusMetaProperty) \ + .n_dbus_properties = (sizeof ((const NMLDBusMetaProperty []) { __VA_ARGS__ }) / sizeof (NMLDBusMetaProperty)) #define NML_DBUS_META_IFACE_INIT(v_dbus_iface_name, \ v_get_type_fcn, \ @@ -557,9 +557,15 @@ struct _NMLDBusMetaIface { ##__VA_ARGS__ \ } -#define NML_DBUS_META_IFACE_INIT_PROP(...) \ - NML_DBUS_META_IFACE_INIT (__VA_ARGS__ \ - NML_DBUS_META_IFACE_OBJ_PROPERTIES ()) +#define NML_DBUS_META_IFACE_INIT_PROP(v_dbus_iface_name, \ + v_get_type_fcn, \ + v_interface_prio, \ + ...) \ + NML_DBUS_META_IFACE_INIT (v_dbus_iface_name, \ + v_get_type_fcn, \ + v_interface_prio, \ + NML_DBUS_META_IFACE_OBJ_PROPERTIES (), \ + ##__VA_ARGS__) extern const NMLDBusMetaIface *const _nml_dbus_meta_ifaces[44]; |