diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-03-19 16:17:13 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-03-19 16:17:13 +0100 |
| commit | 9920e41d48f93b794ab1ab59b0a2f9c8edbe5c07 (patch) | |
| tree | d624d230049607b9cf28e92e4a94fd477171fc94 /libnm-core | |
| parent | b5ca5b45b1aa47e373af49b27064e813b4f77194 (diff) | |
| parent | b225b477d3f6e110bf61ccd88e4ad176504e36b0 (diff) | |
Update upstream source from tag 'upstream/1.16.0'
Update to upstream version '1.16.0' with Debian dir 55e2f8b86df2220d682056c78117065bbe3e5a81
Diffstat (limited to 'libnm-core')
| -rw-r--r-- | libnm-core/nm-core-internal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 6e2a5b5e..f2332f76 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -527,7 +527,7 @@ nm_utils_inet6_ntop_dup (const struct in6_addr *addr) } static inline char * -nm_utils_inet_ntop_dup (int addr_family, const struct in6_addr *addr) +nm_utils_inet_ntop_dup (int addr_family, gconstpointer addr) { char buf[NM_UTILS_INET_ADDRSTRLEN]; @@ -614,7 +614,7 @@ gboolean nm_sock_addr_endpoint_get_fixed_sockaddr (NMSockAddrEndpoint *self, gpointer sockaddr); #define nm_auto_unref_sockaddrendpoint nm_auto(_nm_auto_unref_sockaddrendpoint) -NM_AUTO_DEFINE_FCN_VOID0 (NMSockAddrEndpoint *, _nm_auto_unref_sockaddrendpoint, nm_sock_addr_endpoint_unref) +NM_AUTO_DEFINE_FCN0 (NMSockAddrEndpoint *, _nm_auto_unref_sockaddrendpoint, nm_sock_addr_endpoint_unref) /*****************************************************************************/ @@ -763,7 +763,7 @@ gboolean _nm_connection_find_secret (NMConnection *self, /*****************************************************************************/ #define nm_auto_unref_wgpeer nm_auto(_nm_auto_unref_wgpeer) -NM_AUTO_DEFINE_FCN_VOID0 (NMWireGuardPeer *, _nm_auto_unref_wgpeer, nm_wireguard_peer_unref) +NM_AUTO_DEFINE_FCN0 (NMWireGuardPeer *, _nm_auto_unref_wgpeer, nm_wireguard_peer_unref) gboolean nm_utils_base64secret_normalize (const char *base64_key, gsize required_key_len, |