diff options
| author | Michael Biebl <biebl@debian.org> | 2018-10-21 03:00:34 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-10-21 03:00:34 +0200 |
| commit | 1f85f9683a41ca116af20fd19940576040303080 (patch) | |
| tree | 54c4ac337fe0b0091772b7ef6a22c715dd985fab /libnm-core/nm-keyfile-utils.h | |
| parent | eca0cfe89a2a7ec88abe9c03075160f46b338137 (diff) | |
| parent | 5554398639fa9e344bd12205a64874e6436b936e (diff) | |
Merge branch 'experimental'
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); |