diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-03-12 15:16:42 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-03-12 15:16:42 +0100 |
| commit | cc4ab276f923ded9f415c1c2bf192994367ab0bb (patch) | |
| tree | ac3a7775665992b27d07eb44186d38ff961a8cd7 /libnm-core/nm-setting-dcb.c | |
| parent | bb1cf58350bb34463e9ffc5f96ac4f9b6bf46d28 (diff) | |
| parent | dd428301eb6f02542015121d7b08d9997f137e50 (diff) | |
Update upstream source from tag 'upstream/1.15.91'
Update to upstream version '1.15.91' with Debian dir 74de38245314cab529c6c94cd9d0b874ce0c2994
Diffstat (limited to 'libnm-core/nm-setting-dcb.c')
| -rw-r--r-- | libnm-core/nm-setting-dcb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libnm-core/nm-setting-dcb.c b/libnm-core/nm-setting-dcb.c index 42c7d247..419d9825 100644 --- a/libnm-core/nm-setting-dcb.c +++ b/libnm-core/nm-setting-dcb.c @@ -23,8 +23,6 @@ #include "nm-setting-dcb.h" -#include <string.h> - #include "nm-utils.h" #include "nm-utils-private.h" #include "nm-setting-private.h" @@ -716,7 +714,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) G_STATIC_ASSERT (sizeof (guint) == sizeof (gboolean)); -static inline void +static void set_array_from_gvalue (const GValue *v, uint *a, size_t len) { GArray *src = g_value_get_boxed (v); @@ -731,7 +729,7 @@ set_array_from_gvalue (const GValue *v, uint *a, size_t len) } #define SET_ARRAY_FROM_GVALUE(v, a) set_array_from_gvalue (v, a, G_N_ELEMENTS (a)) -static inline void +static void set_gvalue_from_array (GValue *v, uint *a, size_t len) { GArray *src = g_array_sized_new (FALSE, TRUE, sizeof (guint), len); |