diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /libnm-core/nm-keyfile-utils.h | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
Diffstat (limited to 'libnm-core/nm-keyfile-utils.h')
| -rw-r--r-- | libnm-core/nm-keyfile-utils.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libnm-core/nm-keyfile-utils.h b/libnm-core/nm-keyfile-utils.h index 832ad0b4..46a6d564 100644 --- a/libnm-core/nm-keyfile-utils.h +++ b/libnm-core/nm-keyfile-utils.h @@ -46,8 +46,8 @@ void nm_keyfile_plugin_kf_set_##stype##_list (GKeyFile *kf, \ const char *key, \ set_ctype list[], \ gsize length); -DEFINE_KF_LIST_WRAPPER_PROTO(integer, gint*, gint) -DEFINE_KF_LIST_WRAPPER_PROTO(string, gchar**, const gchar* const) +DEFINE_KF_LIST_WRAPPER_PROTO(integer, int*, int) +DEFINE_KF_LIST_WRAPPER_PROTO(string, char**, const char* const) void nm_keyfile_plugin_kf_set_integer_list_uint8 (GKeyFile *kf, const char *group, @@ -66,14 +66,14 @@ void nm_keyfile_plugin_kf_set_##stype (GKeyFile *kf, \ const char *group, \ const char *key, \ set_ctype value); -DEFINE_KF_WRAPPER_PROTO(string, gchar*, const gchar*) -DEFINE_KF_WRAPPER_PROTO(integer, gint, gint) +DEFINE_KF_WRAPPER_PROTO(string, char*, const char*) +DEFINE_KF_WRAPPER_PROTO(integer, int, int) DEFINE_KF_WRAPPER_PROTO(uint64, guint64, guint64) DEFINE_KF_WRAPPER_PROTO(boolean, gboolean, gboolean) -DEFINE_KF_WRAPPER_PROTO(value, gchar*, const gchar*) +DEFINE_KF_WRAPPER_PROTO(value, char*, const char*) /* Misc */ -gchar ** nm_keyfile_plugin_kf_get_keys (GKeyFile *kf, +char ** nm_keyfile_plugin_kf_get_keys (GKeyFile *kf, const char *group, gsize *out_length, GError **error); |