diff options
| author | Michael Biebl <biebl@debian.org> | 2018-09-23 10:10:27 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-09-23 10:10:27 +0200 |
| commit | e126f3e804c35480c4f075777430419d6ece23da (patch) | |
| tree | 5d5821ebcda8cd6ac34d2483bb3354910e508930 /libnm-core/nm-utils.h | |
| parent | c240974325c552cad177c457d6ff04e381fd77a3 (diff) | |
New upstream version 1.12.4 upstream/1.12.4
Diffstat (limited to 'libnm-core/nm-utils.h')
| -rw-r--r-- | libnm-core/nm-utils.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h index cf9572b9..70245869 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -34,9 +34,8 @@ #include <linux/if_infiniband.h> #include "nm-core-enum-types.h" -#include "nm-setting-sriov.h" -#include "nm-setting-tc-config.h" #include "nm-setting-wireless-security.h" +#include "nm-setting-tc-config.h" G_BEGIN_DECLS @@ -214,7 +213,7 @@ NM_AVAILABLE_IN_1_2 gboolean nm_utils_enum_from_str (GType type, const char *str, int *out_value, char **err_token); NM_AVAILABLE_IN_1_2 -const char **nm_utils_enum_get_values (GType type, int from, int to); +const char **nm_utils_enum_get_values (GType type, gint from, gint to); NM_AVAILABLE_IN_1_6 guint nm_utils_version (void); @@ -251,17 +250,9 @@ char *nm_utils_tc_tfilter_to_str (NMTCTfilter *tfilter, GError **error /*****************************************************************************/ -NM_AVAILABLE_IN_1_14 -char *nm_utils_sriov_vf_to_str (const NMSriovVF *vf, gboolean omit_index, GError **error); -NM_AVAILABLE_IN_1_14 -NMSriovVF *nm_utils_sriov_vf_from_str (const char *str, GError **error); - -/*****************************************************************************/ - NM_AVAILABLE_IN_1_12 gint64 nm_utils_get_timestamp_msec (void); - G_END_DECLS #endif /* __NM_UTILS_H__ */ |