From 58f8be580039b0575b197b9573a1c92745d96d30 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 17 Jan 2017 20:25:09 +0100 Subject: New upstream version 1.5.90 --- src/platform/nmp-netns.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src/platform/nmp-netns.h') diff --git a/src/platform/nmp-netns.h b/src/platform/nmp-netns.h index 4eac07ac..56c1e7e8 100644 --- a/src/platform/nmp-netns.h +++ b/src/platform/nmp-netns.h @@ -33,16 +33,7 @@ #define NMP_NETNS_FD_NET "fd-net" #define NMP_NETNS_FD_MNT "fd-mnt" -struct _NMPNetnsPrivate; - -struct _NMPNetns { - GObject parent; - struct _NMPNetnsPrivate *priv; -}; - -typedef struct { - GObjectClass parent; -} NMPNetnsClass; +typedef struct _NMPNetnsClass NMPNetnsClass; GType nmp_netns_get_type (void); @@ -62,8 +53,12 @@ int nmp_netns_get_fd_mnt (NMPNetns *self); static inline void _nm_auto_pop_netns (NMPNetns **p) { - if (*p) + if (*p) { + int errsv = errno; + nmp_netns_pop (*p); + errno = errsv; + } } #define nm_auto_pop_netns __attribute__((cleanup(_nm_auto_pop_netns))) -- cgit 1.3.0-6-gf8a5